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

DynamicLinker: Implement support for RPATH and RUNPATH

Browse source
This commit is contained in:
Tim Schumacher 2022-02-18 19:22:45 +01:00 • committed by Linus Groh
parent 7bd0a3e9ba
commit e7f861f34c
1 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -101,7 +101,7 @@ static Result<NonnullRefPtr<DynamicLoader>, DlErrorMessage> map_library(const St
return loader; return loader;
} }
static Result<NonnullRefPtr<DynamicLoader>, DlErrorMessage> map_library(const String& name) static Result<NonnullRefPtr<DynamicLoader>, DlErrorMessage> map_library(String const& name, DynamicObject const& parent_object)
{ {
if (name.contains("/"sv)) { if (name.contains("/"sv)) {
int fd = open(name.characters(), O_RDONLY); int fd = open(name.characters(), O_RDONLY);
@ -110,25 +110,29 @@ static Result<NonnullRefPtr<DynamicLoader>, DlErrorMessage> map_library(const St
return map_library(name, fd); return map_library(name, fd);
} }
// Scan the LD_LIBRARY_PATH environment variable if applicable Vector<StringView> search_paths;
if (s_ld_library_path != nullptr) {
for (const auto& search_path : s_ld_library_path.split_view(':')) { // Search RPATH values indicated by the ELF (only if RUNPATH is not present).
LexicalPath library_path(search_path); if (parent_object.runpath().is_empty())
int fd = open(library_path.append(name).string().characters(), O_RDONLY); search_paths.extend(parent_object.rpath().split_view(':'));
if (fd < 0)
continue; // Scan the LD_LIBRARY_PATH environment variable if applicable.
return map_library(name, fd); search_paths.extend(s_ld_library_path.split_view(':'));
}
} // Search RUNPATH values indicated by the ELF.
search_paths.extend(parent_object.runpath().split_view(':'));
// Last are the default search paths.
search_paths.append("/usr/lib"sv);
search_paths.append("/usr/local/lib"sv);
for (auto const& search_path : search_paths) {
LexicalPath library_path(search_path);
int fd = open(library_path.append(name).string().characters(), O_RDONLY);
// Now check the default paths.
// TODO: Do we want to also look for libs in other paths too?
const char* search_paths[] = { "/usr/lib/{}", "/usr/local/lib/{}" };
for (auto& search_path : search_paths) {
auto path = String::formatted(search_path, name);
int fd = open(path.characters(), O_RDONLY);
if (fd < 0) if (fd < 0)
continue; continue;
return map_library(name, fd); return map_library(name, fd);
} }
@ -152,12 +156,14 @@ static Result<void, DlErrorMessage> map_dependencies(const String& name)
{ {
dbgln_if(DYNAMIC_LOAD_DEBUG, "mapping dependencies for: {}", name); dbgln_if(DYNAMIC_LOAD_DEBUG, "mapping dependencies for: {}", name);
auto const& parent_object = (*s_loaders.get(name))->dynamic_object();
for (const auto& needed_name : get_dependencies(name)) { for (const auto& needed_name : get_dependencies(name)) {
dbgln_if(DYNAMIC_LOAD_DEBUG, "needed library: {}", needed_name.characters()); dbgln_if(DYNAMIC_LOAD_DEBUG, "needed library: {}", needed_name.characters());
String library_name = get_library_name(needed_name); String library_name = get_library_name(needed_name);
if (!s_loaders.contains(library_name) && !s_global_objects.contains(library_name)) { if (!s_loaders.contains(library_name) && !s_global_objects.contains(library_name)) {
auto result1 = map_library(needed_name); auto result1 = map_library(needed_name, parent_object);
if (result1.is_error()) { if (result1.is_error()) {
return result1.error(); return result1.error();
} }
@ -415,7 +421,9 @@ static Result<void*, DlErrorMessage> __dlopen(const char* filename, int flags)
VERIFY(!library_name.is_empty()); VERIFY(!library_name.is_empty());
auto result1 = map_library(filename); auto const& parent_object = **s_global_objects.get(get_library_name(s_main_program_name));
auto result1 = map_library(filename, parent_object);
if (result1.is_error()) { if (result1.is_error()) {
return result1.error(); return result1.error();
} }