From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: pwouters@redhat.com, fweimer@redhat.com
Subject: [PATCH conntrackd 4/8] conntrackd: fix descriptor leak in do_local_request()
Date: Tue, 18 Aug 2015 19:28:35 +0200 [thread overview]
Message-ID: <1439918919-6937-5-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1439918919-6937-1-git-send-email-pablo@netfilter.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
src/local.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/local.c b/src/local.c
index 453799a..85e5180 100644
--- a/src/local.c
+++ b/src/local.c
@@ -147,11 +147,14 @@ int do_local_request(int request,
ret = send(fd, &request, sizeof(int), 0);
if (ret == -1)
- return -1;
+ goto err1;
do_local_client_step(fd, step);
local_client_destroy(fd);
-
+
return 0;
+err1:
+ local_client_destroy(fd);
+ return -1;
}
--
1.7.10.4
next prev parent reply other threads:[~2015-08-18 17:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-18 17:28 [PATCH conntrackd 0/8] unsorted fixes Pablo Neira Ayuso
2015-08-18 17:28 ` [PATCH conntrackd 1/8] conntrackd: fix sanitization of expection attribute in the wire format Pablo Neira Ayuso
2015-08-18 17:28 ` [PATCH conntrackd 2/8] conntrackd: NTA_MAX is also an invalid attribute Pablo Neira Ayuso
2015-08-18 17:28 ` [PATCH conntrackd 3/8] conntrackd: fix leak in fork_process_new() Pablo Neira Ayuso
2015-08-18 17:28 ` Pablo Neira Ayuso [this message]
2015-08-18 17:28 ` [PATCH conntrackd 5/8] conntrackd: fix error handling in nfq_queue_cb() Pablo Neira Ayuso
2015-08-18 17:28 ` [PATCH conntrackd 6/8] conntrackd: simplify branch in tcp_accept() Pablo Neira Ayuso
2015-08-18 17:28 ` [PATCH conntrackd 7/8] conntrackd: use strncpy to set up the cache name Pablo Neira Ayuso
2015-08-18 17:28 ` [PATCH conntrackd 8/8] conntrackd: missing break in expectation message parser function Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439918919-6937-5-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=fweimer@redhat.com \
--cc=netfilter-devel@vger.kernel.org \
--cc=pwouters@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).