generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Look into local group on dlsym with RTLD_DEFAULT

Browse Source 
Fix dlsym to look into local group when called with
  RTLD_DEFAULT and RTLD_NEXT.

Bug: 17512583
Change-Id: I541354e89539c712af2ea4ec751e546913027084
This commit is contained in:
Dmitriy Ivanov
2015-04-01 14:45:10 -07:00
parent ab7c79e22e
commit 76ac1acdac
6 changed files with 100 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
linker/linker.cpp
View File

@@ -738,15 +738,21 @@ ElfW(Sym)* dlsym_handle_lookup(soinfo* si, soinfo** found, const char* name) {
beginning of the global solist. Otherwise the search starts at the
specified soinfo (for RTLD_NEXT).
*/
ElfW(Sym)* dlsym_linear_lookup(const char* name, soinfo** found, soinfo* start) {
ElfW(Sym)* dlsym_linear_lookup(const char* name, soinfo** found, soinfo* caller, void* handle) {
SymbolName symbol_name(name);
if (start == nullptr) {
start = solist;
soinfo* start = solist;
if (handle == RTLD_NEXT) {
if (caller == nullptr || caller->next == nullptr) {
return nullptr;
} else {
start = caller->next;
}
}
ElfW(Sym)* s = nullptr;
for (soinfo* si = start; (s == nullptr) && (si != nullptr); si = si->next) {
for (soinfo* si = start; si != nullptr; si = si->next) {
if ((si->get_rtld_flags() & RTLD_GLOBAL) == 0) {
continue;
}
@@ -758,6 +764,30 @@ ElfW(Sym)* dlsym_linear_lookup(const char* name, soinfo** found, soinfo* start)
}
}
// If not found - look into local_group unless
// caller is part of the global group in which
// case we already did it.
if (s == nullptr && caller != nullptr &&
(caller->get_rtld_flags() & RTLD_GLOBAL) == 0) {
soinfo* local_group_root = caller->get_local_group_root();
if (handle == RTLD_DEFAULT) {
start = local_group_root;
}
for (soinfo* si = start; si != nullptr; si = si->next) {
if (si->get_local_group_root() != local_group_root) {
break;
}
s = si->find_symbol_by_name(symbol_name);
if (s != nullptr) {
*found = si;
break;
}
}
}
if (s != nullptr) {
TRACE_TYPE(LOOKUP, "%s s->st_value = %p, found->base = %p",
name, reinterpret_cast<void*>(s->st_value), reinterpret_cast<void*>((*found)->base));