diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2018-02-27 15:28:44 -0800 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2018-03-13 11:30:22 -0700 |
| commit | 72d75bb3166047c74db2931eecb92f9684e70ead (patch) | |
| tree | e8dfa00e67546793ff7fdf5ba95996a99696cb52 /linux-user | |
| parent | 21b869a321871728077a5d0469a05f0d34041650 (diff) | |
| download | qemu-72d75bb3166047c74db2931eecb92f9684e70ead.zip qemu-72d75bb3166047c74db2931eecb92f9684e70ead.tar.gz qemu-72d75bb3166047c74db2931eecb92f9684e70ead.tar.bz2 | |
linux-user: fix target_mprotect/target_munmap error return values
target_mprotect/target_munmap return value goes through get_errno at the
call site, thus the functions must either set errno to host error code
and return -1 or return negative guest error code. Do the latter.
Cc: qemu-stable@nongnu.org
Cc: Riku Voipio <riku.voipio@iki.fi>
Cc: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/mmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux-user/mmap.c b/linux-user/mmap.c index df81f9b..84b15c9 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -77,11 +77,11 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) #endif if ((start & ~TARGET_PAGE_MASK) != 0) - return -EINVAL; + return -TARGET_EINVAL; len = TARGET_PAGE_ALIGN(len); end = start + len; if (!guest_range_valid(start, len)) { - return -ENOMEM; + return -TARGET_ENOMEM; } prot &= PROT_READ | PROT_WRITE | PROT_EXEC; if (len == 0) @@ -621,10 +621,10 @@ int target_munmap(abi_ulong start, abi_ulong len) start, len); #endif if (start & ~TARGET_PAGE_MASK) - return -EINVAL; + return -TARGET_EINVAL; len = TARGET_PAGE_ALIGN(len); if (len == 0 || !guest_range_valid(start, len)) { - return -EINVAL; + return -TARGET_EINVAL; } mmap_lock(); |