[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/16] mmap-alloc: fix error handling
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 05/16] mmap-alloc: fix error handling |
Date: |
Thu, 29 Oct 2015 11:39:33 +0200 |
Existing callers are checking for MAP_FAILED,
so we should return that on error.
Reported-by: Paolo Bonzini <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
util/mmap-alloc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
index 1394269..c37acbe 100644
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@@ -26,7 +26,7 @@ void *qemu_ram_mmap(int fd, size_t size, size_t align, bool
shared)
void *ptr1;
if (ptr == MAP_FAILED) {
- return NULL;
+ return MAP_FAILED;
}
/* Make sure align is a power of 2 */
@@ -41,7 +41,7 @@ void *qemu_ram_mmap(int fd, size_t size, size_t align, bool
shared)
fd, 0);
if (ptr1 == MAP_FAILED) {
munmap(ptr, total);
- return NULL;
+ return MAP_FAILED;
}
ptr += offset;
--
MST
- [Qemu-devel] [PULL 00/16] virtio, pc, memory: fixes+features for 2.5, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 01/16] vhost-user: cleanup struct size math, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 03/16] vhost-user-test: fix up rhel6 build, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 02/16] vhost-user: cleanup msg size math, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 04/16] pc: memhp: do not emit inserting event for coldplugged DIMMs, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 05/16] mmap-alloc: fix error handling,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 06/16] virtio: introduce virtio_map, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 07/16] virtio: switch to virtio_map, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 10/16] virtio-scsi: convert to virtqueue_map, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 12/16] Revert "pc: memhp: force gaps between DIMM's GPA", Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 11/16] virtio: drop virtqueue_map_sg, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 09/16] virtio-serial: convert to virtio_map, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 08/16] virtio-blk: convert to virtqueue_map, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 13/16] Revert "memhp: extend address auto assignment to support gaps", Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 15/16] remove function during multi-function hot-add, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 14/16] tests/vhost-user-bridge: add vhost-user bridge application, Michael S. Tsirkin, 2015/10/29