From dd72a4542e9fee050b701f9230af8500ae7dbe91 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Mon, 23 Sep 2024 13:54:48 +0200 Subject: [PATCH] [BOX32][NON4K] Try to fix elfloader when elf wants to load at an address not-compatible with pagesize --- src/elfs/elfloader32.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/elfs/elfloader32.c b/src/elfs/elfloader32.c index 3b9ae080..ecb6d06c 100644 --- a/src/elfs/elfloader32.c +++ b/src/elfs/elfloader32.c @@ -158,6 +158,11 @@ int AllocLoadElfMemory32(box64context_t* context, elfheader_t* head, int mainbin image = (void*)(((uintptr_t)raw+max_align)&~max_align); } else { image = raw = mmap64(from_ptrv(head->vaddr), sz, 0, MAP_ANONYMOUS|MAP_PRIVATE|MAP_NORESERVE, -1, 0); + if(from_ptr(head->vaddr)&(box64_pagesize-1)) { + // load address might be lower + if((uintptr_t)image == from_ptr(head->vaddr)&~(box64_pagesize-1)) + image = from_ptrv(head->vaddr); + } } if(image!=MAP_FAILED && !head->vaddr && image!=from_ptrv(offs)) { printf_log(LOG_INFO, "%s: Mmap64 for (@%p 0x%zx) for elf \"%s\" returned %p(%p/0x%zx) instead\n", (((uintptr_t)image)&max_align)?"Error":"Warning", from_ptrv(head->vaddr?head->vaddr:offs), head->memsz, head->name, image, raw, head->align);