virNetSocketNewConnectUNIX: Don't unlink(NULL)

There is a possibility that we jump onto error label with @lockpath
still initialized to NULL. Here, the @lockpath should be unlink()-ed,
but passing there a NULL is not a good idea. Don't do that. In fact,
we should call unlink() only if we created the lock file successfully.

Reported-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index b8242850ae8c01e8a994ee1a4fa2994d96707e36..a59e3e11542beea53ed2e5f1b1140588a273ae07 100644 (file)
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -622,7 +622,7 @@ int virNetSocketNewConnectUNIX(const char *path,
         usleep(5000);
     }
 
-    if (lockfd) {
+    if (lockfd != -1) {
         unlink(lockpath);
         VIR_FORCE_CLOSE(lockfd);
         VIR_FREE(lockpath);
@@ -640,12 +640,13 @@ int virNetSocketNewConnectUNIX(const char *path,
     return 0;
 
  error:
-    if (lockfd)
+    if (lockfd != -1) {
         unlink(lockpath);
+        VIR_FORCE_CLOSE(lockfd);
+    }
     VIR_FREE(lockpath);
     VIR_FREE(rundir);
     VIR_FORCE_CLOSE(fd);
-    VIR_FORCE_CLOSE(lockfd);
     return -1;
 }
 #else