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>
Bingwu Zhang committed
Feb 28, 2026 at 00:46 UTC
e8e7d1f97785be2fd81fc520e0c7b9d228c10a56
1 file changed
+5
-3
bsd-user/mmap.c
+5
-3
@@ -258,12 +258,14 @@ abi_ulong mmap_next_start = TASK_UNMAPPED_BASE;
258
static abi_ulong mmap_find_vma_reserved(abi_ulong start, abi_ulong size,
259
abi_ulong alignment)
260
{
261
- abi_ulong ret;
261
+ abi_ulong ret = -1;
262
263
- ret = page_find_range_empty(start, reserved_va, size, alignment);
263
+ if (start <= reserved_va) {
264
+ ret = page_find_range_empty(start, reserved_va, size, alignment);
265
+ }
266
if (ret == -1 && start > TARGET_PAGE_SIZE) {
267
/* Restart at the beginning of the address space. */
266
- ret = page_find_range_empty(TARGET_PAGE_SIZE, start - 1,
268
+ ret = page_find_range_empty(TARGET_PAGE_SIZE, MIN(start - 1, reserved_va),
269
size, alignment);
270
}
271