[NON4K] Try to fix elfloader when elf wants to load at an address not-compatible with pagesize

1 files changed, 5 insertions, 0 deletions

diff --git a/src/elfs/elfloader.c b/src/elfs/elfloader.c
index a4ea5d0c..64fed8f4 100644
--- a/src/elfs/elfloader.c
+++ b/src/elfs/elfloader.c
@@ -240,6 +240,11 @@ int AllocLoadElfMemory(box64context_t* context, elfheader_t* head, int mainbin)
         image = (void*)(((uintptr_t)raw+max_align)&~max_align);
     } else {
         image = raw = mmap64((void*)head->vaddr, sz, 0, MAP_ANONYMOUS|MAP_PRIVATE|MAP_NORESERVE, -1, 0);
+        if(head->vaddr&(box64_pagesize-1)) {
+            // load address might be lower
+            if((uintptr_t)image == head->vaddr&~(box64_pagesize-1))
+                image = (void*)head->vaddr;
+        }
     }
     if(image!=MAP_FAILED && !head->vaddr && image!=(void*)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", (void*)(head->vaddr?head->vaddr:offs), head->memsz, head->name, image, raw, head->align);