From: Matthew Lugg <[email protected]> This typo meant that calls to `mremap` which shrink a mapping by some N bytes would, when the virtual address space was pre-reserved (e.g. 32-bit guest on 64-bit host), unmap the N bytes following the *original* mapping.
Signed-off-by: Matthew Lugg <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Signed-off-by: Richard Henderson <[email protected]> Message-ID: <[email protected]> (cherry picked from commit aaed9ca1797d70a507371aea688c5cd60b074e2d) Signed-off-by: Michael Tokarev <[email protected]> diff --git a/linux-user/mmap.c b/linux-user/mmap.c index d1f36e6f16..703f8ca3cd 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -1169,7 +1169,8 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, errno = ENOMEM; host_addr = MAP_FAILED; } else if (reserved_va && old_size > new_size) { - mmap_reserve_or_unmap(old_addr + old_size, + /* Re-reserve pages we just shrunk out of the mapping */ + mmap_reserve_or_unmap(old_addr + new_size, old_size - new_size); } } -- 2.47.3
