RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:47:44 +00:00
Code Issues Activity Actions

Kernel: Consolidate finding the ELF stack size with validation

Browse source 
Previously, we started parsing the ELF file again in a completely
different place, and without the partial mapping that we do while
validating.

Instead of doing manual parsing in two places, just capture the
requested stack size right after we validated it.
This commit is contained in:
Tim Schumacher 2023-07-10 11:13:13 +02:00 • committed by Andrew Kaster
parent 398f7ae988
commit 9d6372ff07
5 changed files with 29 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Libraries/LibELF/Validation.cpp
View file

@ -187,7 +187,7 @@ bool validate_elf_header(ElfW(Ehdr) const& elf_header, size_t file_size, bool ve
return true;
}
ErrorOr<bool> validate_program_headers(ElfW(Ehdr) const& elf_header, size_t file_size, ReadonlyBytes buffer, StringBuilder* interpreter_path_builder, bool verbose)
ErrorOr<bool> validate_program_headers(ElfW(Ehdr) const& elf_header, size_t file_size, ReadonlyBytes buffer, StringBuilder* interpreter_path_builder, Optional<size_t>* requested_stack_size, bool verbose)
{
Checked<size_t> total_size_of_program_headers = elf_header.e_phnum;
total_size_of_program_headers *= elf_header.e_phentsize;
@ -306,6 +306,9 @@ ErrorOr<bool> validate_program_headers(ElfW(Ehdr) const& elf_header, size_t file
dbgln("PT_GNU_STACK size is not page-aligned.");
return false;
}
if (requested_stack_size)
*requested_stack_size = program_header.p_memsz;
}
break;