From: Alon Levy <alevy@redhat.com>
To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org
Subject: [Qemu-devel] [PATCH 3/5] libcacard/vscclient: fix leakage of socket on error paths
Date: Tue, 4 Jun 2013 16:23:37 -0400 [thread overview]
Message-ID: <1370377419-31788-3-git-send-email-alevy@redhat.com> (raw)
In-Reply-To: <1370377419-31788-1-git-send-email-alevy@redhat.com>
Spotted by Coverity.
Signed-off-by: Alon Levy <alevy@redhat.com>
---
libcacard/vscclient.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c
index ac23647..5180d29 100644
--- a/libcacard/vscclient.c
+++ b/libcacard/vscclient.c
@@ -618,18 +618,22 @@ connect_to_qemu(
if (ret != 0) {
/* Error */
fprintf(stderr, "getaddrinfo failed\n");
- return -1;
+ goto cleanup_socket;
}
if (connect(sock, server->ai_addr, server->ai_addrlen) < 0) {
/* Error */
fprintf(stderr, "Could not connect\n");
- return -1;
+ goto cleanup_socket;
}
if (verbose) {
printf("Connected (sizeof Header=%zd)!\n", sizeof(VSCMsgHeader));
}
return sock;
+
+cleanup_socket:
+ closesocket(sock);
+ return -1;
}
int
@@ -759,5 +763,6 @@ main(
g_io_channel_unref(channel_socket);
g_byte_array_unref(socket_to_send);
+ closesocket(sock);
return 0;
}
--
1.8.2.1
next prev parent reply other threads:[~2013-06-04 20:24 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-04 20:23 [Qemu-devel] [PATCH 1/5] oslib-posix: add qemu_pipe_non_block Alon Levy
2013-06-04 20:23 ` [Qemu-devel] [PATCH 2/5] use qemu_pipe_non_block Alon Levy
2013-06-04 20:47 ` Paolo Bonzini
2013-06-04 20:59 ` Alon Levy
2013-06-04 21:08 ` Peter Maydell
2013-06-04 20:50 ` Peter Maydell
2013-06-04 20:56 ` Alon Levy
2013-06-04 20:23 ` Alon Levy [this message]
2013-06-04 20:55 ` [Qemu-devel] [PATCH 3/5] libcacard/vscclient: fix leakage of socket on error paths Peter Maydell
2013-06-12 12:09 ` [Qemu-devel] [Qemu-trivial] " Michael Tokarev
2013-06-04 20:23 ` [Qemu-devel] [PATCH 4/5] libcacard/vreader.c: fix possible NULL dereference Alon Levy
2013-06-04 21:06 ` Peter Maydell
2013-06-04 20:23 ` [Qemu-devel] [PATCH 5/5] libcacard/vscclient.c: fix use of uninitialized variable Alon Levy
2013-06-04 21:12 ` Peter Maydell
2013-06-04 20:48 ` [Qemu-devel] [PATCH 1/5] oslib-posix: add qemu_pipe_non_block Peter Maydell
2013-06-04 21:11 ` Eric Blake
2013-06-04 21:41 ` Alon Levy
2013-06-05 19:43 ` [Qemu-devel] [Qemu-trivial] " Michael Tokarev
2013-06-12 9:38 ` Michael Tokarev
2013-06-12 11:21 ` Alon Levy
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=1370377419-31788-3-git-send-email-alevy@redhat.com \
--to=alevy@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/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).