yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-06-19 07:27:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

mmap-alloc: fix error handling

Browse source 
Existing callers are checking for MAP_FAILED,
so we should return that on error.

Backports commit 9d4ec9370a36f8a564e1ba05519328c0bd60da13 from qemu
This commit is contained in:
Michael S. Tsirkin 2018-02-17 14:11:46 -05:00 committed by Lioncash
parent c01a6dab0a
commit bdbaeb4b9b
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qemu/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;