From c21ec3b7351c49e6bc6a49983d59701377c75d9b Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Sat, 30 Sep 2023 00:53:43 +0200 Subject: [PATCH] BUG/MINOR: proto_reverse_connect: fix FD leak upon connect new_reverse_conn() is creating its own socket with sock_create_server_socket(). However the connect is done with conn->ctrl->connect() which is tcp_connect_server(). tcp_connect_server() is also creating its own socket and sets it in the struct conn, left the previous socket unclosed and leaking at each attempt. This patch fixes the issue by letting tcp_connect_server() handling the socket part, and removes it in new_reverse_conn(). --- src/proto_reverse_connect.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/proto_reverse_connect.c b/src/proto_reverse_connect.c index 1649a69df..61cf44806 100644 --- a/src/proto_reverse_connect.c +++ b/src/proto_reverse_connect.c @@ -68,11 +68,6 @@ static struct connection *new_reverse_conn(struct listener *l, struct server *sr if (conn_prepare(conn, protocol_lookup(conn->dst->ss_family, PROTO_TYPE_STREAM, 0), srv->xprt)) goto err; - /* TODO simplification of tcp_connect_server() */ - conn->handle.fd = sock_create_server_socket(conn); - if (fd_set_nonblock(conn->handle.fd) == -1) - goto err; - if (conn->ctrl->connect(conn, 0) != SF_ERR_NONE) goto err;