diff options
| author | Mitch Phillips <mitchp@google.com> | 2021-01-25 17:56:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-25 17:56:37 +0000 |
| commit | 0a6a89d04f94ef3f73a7d52c0751287d57e81b2c (patch) | |
| tree | 292c4c5b3a6271deb446ccb3745b24332220bb53 /debuggerd/libdebuggerd/scudo.cpp | |
| parent | 074c8f348ea68c2e2a7accbcb21332f9063cc091 (diff) | |
| parent | 9951b2fa1a2b302678e31ccac991d505ccda4a03 (diff) | |
Merge "[MTE] Cleanup tagged si_addr refs to fix mappings OOB bug." am: 1d792bf90a am: 9951b2fa1a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556425
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1a84f7f3ab171ee86376c9743c478501b3d31e62
Diffstat (limited to 'debuggerd/libdebuggerd/scudo.cpp')
| -rw-r--r-- | debuggerd/libdebuggerd/scudo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debuggerd/libdebuggerd/scudo.cpp b/debuggerd/libdebuggerd/scudo.cpp index f8bfe07ce6..141c3bd18d 100644 --- a/debuggerd/libdebuggerd/scudo.cpp +++ b/debuggerd/libdebuggerd/scudo.cpp @@ -44,7 +44,7 @@ ScudoCrashData::ScudoCrashData(unwindstack::Memory* process_memory, auto region_info = AllocAndReadFully(process_memory, process_info.scudo_region_info, __scudo_get_region_info_size()); - untagged_fault_addr_ = untag_address(process_info.fault_address); + untagged_fault_addr_ = process_info.untagged_fault_address; uintptr_t fault_page = untagged_fault_addr_ & ~(PAGE_SIZE - 1); uintptr_t memory_begin = fault_page - PAGE_SIZE * 16; @@ -67,7 +67,7 @@ ScudoCrashData::ScudoCrashData(unwindstack::Memory* process_memory, memory_tags[(i - memory_begin) / kTagGranuleSize] = process_memory->ReadTag(i); } - __scudo_get_error_info(&error_info_, process_info.fault_address, stack_depot.get(), + __scudo_get_error_info(&error_info_, process_info.maybe_tagged_fault_address, stack_depot.get(), region_info.get(), memory.get(), memory_tags.get(), memory_begin, memory_end - memory_begin); } |