Commit e8e7d1f977 for qemu.org

commit e8e7d1f97785be2fd81fc520e0c7b9d228c10a56
Author: Bingwu Zhang <xtex@astrafall.org>
Date:   Sat Feb 28 00:46:31 2026 +0800

    bsd-user: Deal with mmap where start > reserved_va

    Fixes: f12294b5bd21 ("bsd-user: Use page_find_range_empty for mmap_find_vma_reserved")
    Signed-off-by: Bingwu Zhang <xtex@astrafall.org>
    Reviewed-by: Helge Deller <deller@gmx.de>
    Reviewed-by: Warner Losh <imp@bsdimp.com>
    Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
index 24ba1728eb..fe77eceb48 100644
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -258,12 +258,14 @@ abi_ulong mmap_next_start = TASK_UNMAPPED_BASE;
 static abi_ulong mmap_find_vma_reserved(abi_ulong start, abi_ulong size,
                                         abi_ulong alignment)
 {
-    abi_ulong ret;
+    abi_ulong ret = -1;

-    ret = page_find_range_empty(start, reserved_va, size, alignment);
+    if (start <= reserved_va) {
+        ret = page_find_range_empty(start, reserved_va, size, alignment);
+    }
     if (ret == -1 && start > TARGET_PAGE_SIZE) {
         /* Restart at the beginning of the address space. */
-        ret = page_find_range_empty(TARGET_PAGE_SIZE, start - 1,
+        ret = page_find_range_empty(TARGET_PAGE_SIZE, MIN(start - 1, reserved_va),
                                     size, alignment);
     }