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

LibELF: Split the DynamicLoader's loading mechanism into two steps

Browse source 
load_from_image() becomes map() and link(). This allows us to map
an object before mapping its dependencies.

This solves an issue where fixed-position executables (like GCC)
would clash with the ASLR placement of their own shared libraries.
This commit is contained in:
Andreas Kling 2021-01-31 11:46:00 +01:00
parent 36525c0572
commit e313323317
4 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibELF/DynamicLoader.cpp
View file

@ -143,12 +143,12 @@ void* DynamicLoader::symbol_for_name(const char* name)
return m_dynamic_object->base_address().offset(symbol.value()).as_ptr();
}
RefPtr<DynamicObject> DynamicLoader::load_from_image(unsigned flags, size_t total_tls_size)
RefPtr<DynamicObject> DynamicLoader::map()
{
ASSERT(!m_dynamic_object);
if (!m_valid) {
dbgln("DynamicLoader::load_from_image failed: image is invalid");
dbgln("DynamicLoader::map failed: image is invalid");
return nullptr;
}
@ -158,14 +158,14 @@ RefPtr<DynamicObject> DynamicLoader::load_from_image(unsigned flags, size_t tota
m_dynamic_object->set_tls_offset(m_tls_offset);
m_dynamic_object->set_tls_size(m_tls_size);
auto rc = load_stage_2(flags, total_tls_size);
if (!rc) {
dbgln("DynamicLoader::load_from_image failed at load_stage_2");
return nullptr;
}
return m_dynamic_object;
}
bool DynamicLoader::link(unsigned flags, size_t total_tls_size)
{
return load_stage_2(flags, total_tls_size);
}
bool DynamicLoader::load_stage_2(unsigned flags, size_t total_tls_size)
{
ASSERT(flags & RTLD_GLOBAL);