ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user: Propagate failure in mmap_reserve_or_unmap back to target_munmap 

Do not assert success, but return any failure received.
Additionally, fix the method of earlier error return in target_munmap.

Reported-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-10-03 13:59:55 -07:00
parent a9f6004f67
commit 912ff698ca
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
linux-user/mmap.c
View File

@ -778,7 +778,7 @@ fail:
return -1; return -1;
} }
static void mmap_reserve_or_unmap(abi_ulong start, abi_ulong len) static int mmap_reserve_or_unmap(abi_ulong start, abi_ulong len)
{ {
abi_ulong real_start; abi_ulong real_start;
abi_ulong real_last; abi_ulong real_last;
@ -807,7 +807,7 @@ static void mmap_reserve_or_unmap(abi_ulong start, abi_ulong len)
prot |= page_get_flags(a + 1); prot |= page_get_flags(a + 1);
} }
if (prot != 0) { if (prot != 0) {
return; return 0;
} }
} else { } else {
for (prot = 0, a = real_start; a < start; a += TARGET_PAGE_SIZE) { for (prot = 0, a = real_start; a < start; a += TARGET_PAGE_SIZE) {
@ -825,7 +825,7 @@ static void mmap_reserve_or_unmap(abi_ulong start, abi_ulong len)
} }
if (real_last < real_start) { if (real_last < real_start) {
return; return 0;
} }
} }
@ -836,32 +836,36 @@ static void mmap_reserve_or_unmap(abi_ulong start, abi_ulong len)
void *ptr = mmap(host_start, real_len, PROT_NONE, void *ptr = mmap(host_start, real_len, PROT_NONE,
MAP_FIXED | MAP_ANONYMOUS MAP_FIXED | MAP_ANONYMOUS
| MAP_PRIVATE | MAP_NORESERVE, -1, 0); | MAP_PRIVATE | MAP_NORESERVE, -1, 0);
assert(ptr == host_start); return ptr == host_start ? 0 : -1;
} else {
int ret = munmap(host_start, real_len);
assert(ret == 0);
} }
return munmap(host_start, real_len);
} }
int target_munmap(abi_ulong start, abi_ulong len) int target_munmap(abi_ulong start, abi_ulong len)
{ {
int ret;
trace_target_munmap(start, len); trace_target_munmap(start, len);
if (start & ~TARGET_PAGE_MASK) { if (start & ~TARGET_PAGE_MASK) {
return -TARGET_EINVAL; errno = EINVAL;
return -1;
} }
len = TARGET_PAGE_ALIGN(len); len = TARGET_PAGE_ALIGN(len);
if (len == 0 || !guest_range_valid_untagged(start, len)) { if (len == 0 || !guest_range_valid_untagged(start, len)) {
return -TARGET_EINVAL; errno = EINVAL;
return -1;
} }
mmap_lock(); mmap_lock();
mmap_reserve_or_unmap(start, len); ret = mmap_reserve_or_unmap(start, len);
if (likely(ret == 0)) {
page_set_flags(start, start + len - 1, 0); page_set_flags(start, start + len - 1, 0);
shm_region_rm_complete(start, start + len - 1); shm_region_rm_complete(start, start + len - 1);
}
mmap_unlock(); mmap_unlock();
return 0; return ret;
} }
abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,