From f03f1a8115c0b4dcb0a705d8a686ccf511648f60 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sat, 19 Jan 2008 15:02:34 +0100 Subject: [PATCH] dccp_recv.c: Fix a fd leak. If shutdown(fd, SHUT_WR) fails, we miss to close the open fd returned by makesock(). --- dccp_recv.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dccp_recv.c b/dccp_recv.c index a16acc8a..64506737 100644 --- a/dccp_recv.c +++ b/dccp_recv.c @@ -57,18 +57,22 @@ static int dccp_recv_open(struct receiver_node *rn) { struct private_dccp_recv_data *pdd; struct dccp_recv_args_info *conf = rn->conf; - int ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg, conf->port_arg); + int fd, ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg, + conf->port_arg); if (ret < 0) return ret; + fd = ret; /* * Disable unused CCIDs: the receiver does not send any application * data to the server. By shutting down this unused path we reduce * internal processing costs, as the unused CCIDs (in the kernel) are * then bypassed. */ - if (shutdown(ret, SHUT_WR) < 0) - return -ERRNO_TO_PARA_ERROR(errno); + if (shutdown(fd, SHUT_WR) < 0) { + ret = -ERRNO_TO_PARA_ERROR(errno); + goto err; + } rn->buf = para_calloc(DCCP_BUFSIZE); rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data)); @@ -76,6 +80,9 @@ static int dccp_recv_open(struct receiver_node *rn) pdd->fd = ret; mark_fd_nonblocking(pdd->fd); return 1; +err: + close(fd); + return ret; } static void dccp_shutdown(void) -- 2.39.5