linux-user: Deal with mmap where start > reserved_va
Fixes: 4c13048e02d9 ("linux-user: Use page_find_range_empty for mmap_find_vma_reserved") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3310 Signed-off-by: Bingwu Zhang <xtex@astrafall.org> Reviewed-by: Helge Deller <deller@gmx.de> Signed-off-by: Helge Deller <deller@gmx.de>
Bingwu Zhang committed
Feb 28, 2026 at 00:46 UTC
f2813e13fe910e01127271a87177a477b9438bc6
1 file changed
+6
-3
linux-user/mmap.c
+6
-3
@@ -423,12 +423,15 @@ abi_ulong mmap_next_start;
423
static abi_ulong mmap_find_vma_reserved(abi_ulong start, abi_ulong size,
424
abi_ulong align)
425
{
426
- target_ulong ret;
426
+ target_ulong ret = -1;
427
428
- ret = page_find_range_empty(start, reserved_va, size, align);
428
+ if (start <= reserved_va) {
429
+ ret = page_find_range_empty(start, reserved_va, size, align);
430
+ }
431
if (ret == -1 && start > mmap_min_addr) {
432
/* Restart at the beginning of the address space. */
431
- ret = page_find_range_empty(mmap_min_addr, start - 1, size, align);
433
+ ret = page_find_range_empty(mmap_min_addr, MIN(start - 1, reserved_va),
434
+ size, align);
435
}
436
437
return ret;