From 5c3ece79cd0b7b4ed065f4285e7a0262bbfc283b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 17 Mar 2016 15:53:13 +0100 Subject: 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 Signed-off-by: Paolo Bonzini --- exec.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'exec.c') diff --git a/exec.c b/exec.c index be2a644619..f46e596818 100644 --- a/exec.c +++ b/exec.c @@ -1239,7 +1239,7 @@ static void *file_ram_alloc(RAMBlock *block, 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 @@ static void *file_ram_alloc(RAMBlock *block, 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 @@ error: if (unlink_on_error) { unlink(path); } - close(fd); + if (fd != -1) { + close(fd); + } return NULL; } #endif -- cgit v1.2.3