Skip to contentSkip to conversation

libcacard/vscclient: fix leakage of socket on error paths

PATCH In review Alon Levy 1 participant 2 messages May 31, 2013

lore
Share & tools
lore

Alon Levy

author
#0 lore raw

PATCH 1/1 libcacard/vscclient: fix leakage of socket on error paths

Spotted by Coverity.

---
 libcacard/vscclient.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
libcacard/vscclient.c +6 -2
index ac23647..9fcc548 100644
@@ -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
Signature · 1 line
1.8.2.1
author
#1 lore raw
Quoted 2 lines

Spotted by Coverity.

Self NACK.

I'll send a more complete patch, and use closesocket.

Quoted 39 lines
---
 libcacard/vscclient.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
libcacard/vscclient.c +6 -3
index ac23647..9fcc548 100644
@@ -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