Fix support finding global variables.
The code was not properly getting the variable addresses and using
the offset and address fields of the .data section.
Fix all of that, and update the tests.
Bug: 145162678
Test: Unit tests pass.
Test: ./art/test/run-test --dex2oat-jobs 4 --host --prebuild --compact-dex-level fast --jit --no-relocate --runtime-option -Xcheck:jni 137-cfi
Test: ./art/test/testrunner/testrunner.py -t 137 --host
Change-Id: Ic61c4487334fd2273cda9c56eb1a3b525a03edb7
diff --git a/libunwindstack/Global.cpp b/libunwindstack/Global.cpp
index a20be00..ec977e1 100644
--- a/libunwindstack/Global.cpp
+++ b/libunwindstack/Global.cpp
@@ -39,28 +39,22 @@
}
}
-uint64_t Global::GetVariableOffset(MapInfo* info, const std::string& variable) {
- if (!search_libs_.empty()) {
- bool found = false;
- const char* lib = basename(info->name.c_str());
- for (const std::string& name : search_libs_) {
- if (name == lib) {
- found = true;
- break;
- }
- }
- if (!found) {
- return 0;
- }
+bool Global::Searchable(const std::string& name) {
+ if (search_libs_.empty()) {
+ return true;
}
- Elf* elf = info->GetElf(memory_, arch());
- uint64_t ptr;
- // Find first non-empty list (libraries might be loaded multiple times).
- if (elf->GetGlobalVariable(variable, &ptr) && ptr != 0) {
- return ptr + info->start;
+ if (name.empty()) {
+ return false;
}
- return 0;
+
+ const char* base_name = basename(name.c_str());
+ for (const std::string& lib : search_libs_) {
+ if (base_name == lib) {
+ return true;
+ }
+ }
+ return false;
}
void Global::FindAndReadVariable(Maps* maps, const char* var_str) {
@@ -78,24 +72,27 @@
// f2000-f3000 2000 rw- /system/lib/libc.so
MapInfo* map_start = nullptr;
for (const auto& info : *maps) {
- if (map_start != nullptr) {
- if (map_start->name == info->name) {
- if (info->offset != 0 &&
- (info->flags & (PROT_READ | PROT_WRITE)) == (PROT_READ | PROT_WRITE)) {
- uint64_t ptr = GetVariableOffset(map_start, variable);
- if (ptr != 0 && ReadVariableData(ptr)) {
- break;
- } else {
- // Failed to find the global variable, do not bother trying again.
- map_start = nullptr;
+ if (map_start != nullptr && map_start->name == info->name) {
+ if (info->offset != 0 &&
+ (info->flags & (PROT_READ | PROT_WRITE)) == (PROT_READ | PROT_WRITE)) {
+ Elf* elf = map_start->GetElf(memory_, arch());
+ uint64_t ptr;
+ if (elf->GetGlobalVariableOffset(variable, &ptr) && ptr != 0) {
+ uint64_t offset_end = info->offset + info->end - info->start;
+ if (ptr >= info->offset && ptr < offset_end) {
+ ptr = info->start + ptr - info->offset;
+ if (ReadVariableData(ptr)) {
+ break;
+ }
}
}
- } else {
map_start = nullptr;
}
+ } else {
+ map_start = nullptr;
}
if (map_start == nullptr && (info->flags & PROT_READ) && info->offset == 0 &&
- !info->name.empty()) {
+ Searchable(info->name)) {
map_start = info.get();
}
}