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>

diff --git a/exec.c b/exec.c
index be2a644619a1933537c5e0dad5bf6ff3ad884bfd..f46e5968189387a8bcd35d0d2751149eaa1762e2 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -1239,7 +1239,7 @@ static void *file_ram_alloc(RAMBlock *block,
     char *sanitized_name;
     char *c;
     void *area;
     char *sanitized_name;
     char *c;
     void *area;

-    int fd;
+    int fd = -1;

     int64_t page_size;
 
     if (kvm_enabled() && !kvm_has_sync_mmu()) {
     int64_t page_size;
 
     if (kvm_enabled() && !kvm_has_sync_mmu()) {


@@ -1321,7 +1321,6 @@ static void *file_ram_alloc(RAMBlock *block,
     if (area == MAP_FAILED) {
         error_setg_errno(errp, errno,
                          "unable to map backing store for guest RAM");
     if (area == MAP_FAILED) {
         error_setg_errno(errp, errno,
                          "unable to map backing store for guest RAM");

-        close(fd);

         goto error;
     }
 
         goto error;
     }
 


@@ -1336,7 +1335,9 @@ error:
     if (unlink_on_error) {
         unlink(path);
     }
     if (unlink_on_error) {
         unlink(path);
     }

-    close(fd);
+    if (fd != -1) {
+        close(fd);
+    }

     return NULL;
 }
 #endif
     return NULL;
 }
 #endif