falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mmap-alloc: fix error handling 

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>
This commit is contained in:
Michael S. Tsirkin 2015-10-25 17:07:45 +02:00
parent 4828b10bda
commit 9d4ec9370a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/mmap-alloc.c
View File

@ -26,7 +26,7 @@ void *qemu_ram_mmap(int fd, size_t size, size_t align, bool shared)
void *ptr1; void *ptr1;
if (ptr == MAP_FAILED) { if (ptr == MAP_FAILED) {
return NULL; return MAP_FAILED;
} }
/* Make sure align is a power of 2 */ /* 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); fd, 0);
if (ptr1 == MAP_FAILED) { if (ptr1 == MAP_FAILED) {
munmap(ptr, total); munmap(ptr, total);
return NULL; return MAP_FAILED;
} }
ptr += offset; ptr += offset;