commit 5c3ece79cd0b7b4ed065f4285e7a0262bbfc283b
author Paolo Bonzini <pbonzini@redhat.com> Thu Mar 17 15:53:13 2016 +0100
committer Paolo Bonzini <pbonzini@redhat.com> Tue Mar 22 22:20:18 2016 +0100
tree 10ea4cbc22d21a21029798972263ea5dff6895a0
parent 8526e1f4e418443a4d6ed0714487e47d45ef9c98

exec: fix error handling in file_ram_alloc

One instance of double closing, and invalid close(-1) in some cases
of "goto error".

Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

exec.c

diff --git a/exec.c b/exec.c
index be2a644..f46e596 100644
--- a/exec.c
+++ b/exec.c
@@ -1239,7 +1239,7 @@
     char *sanitized_name;
     char *c;
     void *area;
-    int fd;
+    int fd = -1;
     int64_t page_size;
 
     if (kvm_enabled() && !kvm_has_sync_mmu()) {
@@ -1321,7 +1321,6 @@
     if (area == MAP_FAILED) {
         error_setg_errno(errp, errno,
                          "unable to map backing store for guest RAM");
-        close(fd);
         goto error;
     }
 
@@ -1336,7 +1335,9 @@
     if (unlink_on_error) {
         unlink(path);
     }
-    close(fd);
+    if (fd != -1) {
+        close(fd);
+    }
     return NULL;
 }
 #endif