From: Max Filippov <jcmvb...@gmail.com>
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-sta...@nongnu.org
Cc: Riku Voipio <riku.voi...@iki.fi>
Cc: Laurent Vivier <laur...@vivier.eu>
Signed-off-by: Max Filippov <jcmvb...@gmail.com>
Reviewed-by: Laurent Vivier <laur...@vivier.eu>
Message-Id: <20180228221609.11265-8-jcmvb...@gmail.com>
Signed-off-by: Laurent Vivier <laur...@vivier.eu>
---
linux-user/mmap.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index df81f9b803..84b15c9a16 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();
--
2.14.3
