]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
kvm tools: Fix test for mmap failure
authorCyrill Gorcunov <gorcunov@openvz.org>
Fri, 3 Feb 2012 19:37:00 +0000 (23:37 +0400)
committerPekka Enberg <penberg@kernel.org>
Sat, 4 Feb 2012 07:23:56 +0000 (09:23 +0200)
On error mmap returns MAP_FAILED so we need a proper test here.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
tools/kvm/hw/pci-shmem.c

index 8bac15180a629c12a7c5cd324c810f40439c22d0..ac2d264cf733a690bf3d3c3ec1e49fefe91d8b80 100644 (file)
@@ -207,10 +207,11 @@ static void *setup_shmem(const char *key, size_t len, int creating)
        }
        mem = mmap(NULL, len,
                   PROT_READ | PROT_WRITE, MAP_SHARED | MAP_NORESERVE, fd, 0);
-       close(fd);
-
-       if (mem == NULL)
+       if (mem == MAP_FAILED) {
                pr_warning("Failed to mmap shared memory file");
+               mem = NULL;
+       }
+       close(fd);
 
        return mem;
 }