Commit aaed9ca179 for qemu.org

commit aaed9ca1797d70a507371aea688c5cd60b074e2d
Author: Matthew Lugg <mlugg@mlugg.co.uk>
Date:   Mon Nov 17 17:09:51 2025 +0000

    linux-user: fix mremap unmapping adjacent region

    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 <mlugg@mlugg.co.uk>
    Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
    Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
    Message-ID: <20251117170954.31451-2-mlugg@mlugg.co.uk>

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 423c77856a..ef3833a2bb 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -1171,7 +1171,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);
                 }
             }