* [Qemu-devel] [PATCH] libcacard/vscclient: fix leakage of socket on error paths
@ 2013-05-31 17:56 Alon Levy
2013-05-31 17:58 ` Alon Levy
0 siblings, 1 reply; 2+ messages in thread
From: Alon Levy @ 2013-05-31 17:56 UTC (permalink / raw)
To: qemu-devel
Spotted by Coverity.
Signed-off-by: Alon Levy <alevy@redhat.com>
---
libcacard/vscclient.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c
index ac23647..9fcc548 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:
+ close(sock);
+ return -1;
}
int
--
1.8.2.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Qemu-devel] [PATCH] libcacard/vscclient: fix leakage of socket on error paths
2013-05-31 17:56 [Qemu-devel] [PATCH] libcacard/vscclient: fix leakage of socket on error paths Alon Levy
@ 2013-05-31 17:58 ` Alon Levy
0 siblings, 0 replies; 2+ messages in thread
From: Alon Levy @ 2013-05-31 17:58 UTC (permalink / raw)
To: qemu-devel
> Spotted by Coverity.
>
Self NACK.
I'll send a more complete patch, and use closesocket.
> Signed-off-by: Alon Levy <alevy@redhat.com>
> ---
> libcacard/vscclient.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c
> index ac23647..9fcc548 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:
> + close(sock);
> + return -1;
> }
>
> int
> --
> 1.8.2.1
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-31 17:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-31 17:56 [Qemu-devel] [PATCH] libcacard/vscclient: fix leakage of socket on error paths Alon Levy
2013-05-31 17:58 ` Alon Levy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.