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

LibELF: Fix syscall regions for .text segments with a non-zero offset

Browse source 
Previously, we assumed that the `.text` segment was loaded at vaddr 0 in
all dynamic libraries, so we used the dynamic object's base address with
`msyscall`. This did not work with the LLVM toolchain, as it likes to
shuffle these segments around.

This now also handles the case when there are multiple text segments for
some reason correctly.
This commit is contained in:
Daniel Bertalan 2021-07-07 20:46:09 +02:00 • committed by Gunnar Beutner
parent d30dbf47f5
commit 64b1740913
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Libraries/LibELF/DynamicLinker.cpp
View file

@ -301,8 +301,11 @@ static Result<NonnullRefPtr<DynamicLoader>, DlErrorMessage> load_main_library(co
auto& object = result.value(); auto& object = result.value();
if (loader.filename() == "libsystem.so"sv) { if (loader.filename() == "libsystem.so"sv) {
if (syscall(SC_msyscall, object->base_address().as_ptr())) { VERIFY(!loader.text_segments().is_empty());
VERIFY_NOT_REACHED(); for (const auto& segment : loader.text_segments()) {
if (syscall(SC_msyscall, segment.address().get())) {
VERIFY_NOT_REACHED();
}
} }
} }