tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add a way to track all dlsym calls

Browse source 
Add dlsym option to debug.ld.all and debug.ld.app.<appname> which
enables logging of dlsym calls.

Bug: http://b/29458203
Test: flash, set debug.ld.all to dlsym and check
      if there are messages in logcat

Change-Id: I9cb815a38b5b98aac9ebe3ac1540bcdedd2e8db0
This commit is contained in:
Dimitry Ivanov 2016-12-12 16:30:15 -08:00
parent 901de13c37
commit 4742abdcb5
2 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
linker/linker.cpp
View file

@ -1869,15 +1869,33 @@ bool do_dlsym(void* handle,
} }
#endif #endif
if (sym_name == nullptr) {
DL_ERR("dlsym failed: symbol name is null");
return false;
}
soinfo* found = nullptr; soinfo* found = nullptr;
const ElfW(Sym)* sym = nullptr; const ElfW(Sym)* sym = nullptr;
soinfo* caller = find_containing_library(caller_addr); soinfo* caller = find_containing_library(caller_addr);
android_namespace_t* ns = get_caller_namespace(caller); android_namespace_t* ns = get_caller_namespace(caller);
soinfo* si = nullptr;
if (handle != RTLD_DEFAULT && handle != RTLD_NEXT) {
si = soinfo_from_handle(handle);
}
LD_LOG(kLogDlsym,
"dlsym(handle=%p(\"%s\"), sym_name=\"%s\", sym_ver=\"%s\", caller=\"%s\", caller_ns=%s@%p) ...",
handle,
si != nullptr ? si->get_realpath() : "n/a",
sym_name,
sym_ver,
caller == nullptr ? "(null)" : caller->get_realpath(),
ns == nullptr ? "(null)" : ns->get_name(),
ns);
auto failure_guard = make_scope_guard([&]() {
LD_LOG(kLogDlsym, "... dlsym failed: %s", linker_get_error_buffer());
});
if (sym_name == nullptr) {
DL_ERR("dlsym failed: symbol name is null");
return false;
}
version_info vi_instance; version_info vi_instance;
version_info* vi = nullptr; version_info* vi = nullptr;
@ -1891,7 +1909,6 @@ bool do_dlsym(void* handle,
if (handle == RTLD_DEFAULT || handle == RTLD_NEXT) { if (handle == RTLD_DEFAULT || handle == RTLD_NEXT) {
sym = dlsym_linear_lookup(ns, sym_name, vi, &found, caller, handle); sym = dlsym_linear_lookup(ns, sym_name, vi, &found, caller, handle);
} else { } else {
soinfo* si = soinfo_from_handle(handle);
if (si == nullptr) { if (si == nullptr) {
DL_ERR("dlsym failed: invalid handle: %p", handle); DL_ERR("dlsym failed: invalid handle: %p", handle);
return false; return false;
@ -1904,6 +1921,10 @@ bool do_dlsym(void* handle,
if ((bind == STB_GLOBAL || bind == STB_WEAK) && sym->st_shndx != 0) { if ((bind == STB_GLOBAL || bind == STB_WEAK) && sym->st_shndx != 0) {
*symbol = reinterpret_cast<void*>(found->resolve_symbol_address(sym)); *symbol = reinterpret_cast<void*>(found->resolve_symbol_address(sym));
failure_guard.disable();
LD_LOG(kLogDlsym,
"... dlsym successful: sym_name=\"%s\", sym_ver=\"%s\", found in=\"%s\", address=%p",
sym_name, sym_ver, found->get_soname(), *symbol);
return true; return true;
} }

1
linker/linker_logger.h
View file

@ -40,6 +40,7 @@
constexpr const uint32_t kLogErrors = 1 << 0; constexpr const uint32_t kLogErrors = 1 << 0;
constexpr const uint32_t kLogDlopen = 1 << 1; constexpr const uint32_t kLogDlopen = 1 << 1;
constexpr const uint32_t kLogDlsym = 1 << 2;
class LinkerLogger { class LinkerLogger {
public: public: