Aren
/
rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elf: adjust entry point address to paddr in elf32_load

This commit is contained in:
Kacper Słomiński 2021-06-29 15:19:46 +02:00
parent 4fb782449f
commit 22587856fd
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
stage23/lib/elf.c
View File

@ -392,6 +392,9 @@ int elf32_load(uint8_t *elf, uint32_t *entry_point, uint32_t alloc_type) {
return -1;
}
uint32_t entry = hdr.entry;
bool entry_adjusted = false;
for (uint16_t i = 0; i < hdr.ph_num; i++) {
struct elf32_phdr phdr;
memcpy(&phdr, elf + (hdr.phoff + i * sizeof(struct elf32_phdr)),
@ -410,9 +413,15 @@ int elf32_load(uint8_t *elf, uint32_t *entry_point, uint32_t alloc_type) {
void *ptr = (void *)(uintptr_t)(phdr.p_paddr + phdr.p_filesz);
memset(ptr, 0, to_zero);
}
if (!entry_adjusted && entry >= phdr.p_vaddr && entry <= (phdr.p_vaddr + phdr.p_memsz)) {
entry -= phdr.p_vaddr;
entry += phdr.p_paddr;
entry_adjusted = true;
}
}
*entry_point = hdr.entry;
*entry_point = entry;
return 0;
}