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

elf: Fix bug related to overshoot check

Browse Source
This commit is contained in:
mintsuki 2021-10-31 05:17:37 +01:00
parent 057715b60c
commit 7eeadd7194
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stage23/lib/elf.c
View File

@ -542,11 +542,6 @@ final:
uint64_t this_top = load_addr + phdr.p_memsz; uint64_t this_top = load_addr + phdr.p_memsz;
// Make sure we don't overshoot
if (higher_half == true && this_top > 0x80000000) {
goto again;
}
if (top) { if (top) {
if (this_top > *top) { if (this_top > *top) {
*top = this_top; *top = this_top;
@ -564,7 +559,8 @@ final:
} }
if (!fully_virtual && if (!fully_virtual &&
!memmap_alloc_range((size_t)mem_base, (size_t)mem_size, alloc_type, true, false, simulation, false)) { ((higher_half == true && this_top > 0x80000000)
|| !memmap_alloc_range((size_t)mem_base, (size_t)mem_size, alloc_type, true, false, simulation, false))) {
if (++try_count == max_simulated_tries || simulation == false) { if (++try_count == max_simulated_tries || simulation == false) {
panic("elf: Failed to allocate necessary memory ranges"); panic("elf: Failed to allocate necessary memory ranges");
} }