projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4828b10
)
mmap-alloc: fix error handling
author
Michael S. Tsirkin
<mst@redhat.com>
Sun, 25 Oct 2015 15:07:45 +0000
(17:07 +0200)
committer
Michael S. Tsirkin
<mst@redhat.com>
Thu, 29 Oct 2015 09:05:24 +0000
(11:05 +0200)
Existing callers are checking for MAP_FAILED,
so we should return that on error.
Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
util/mmap-alloc.c
patch
|
blob
|
history
diff --git
a/util/mmap-alloc.c
b/util/mmap-alloc.c
index
1394269
..
c37acbe
100644
(file)
--- 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;