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/gwp_asan.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/gwp_asan.cpp')
| -rw-r--r-- | debuggerd/libdebuggerd/gwp_asan.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debuggerd/libdebuggerd/gwp_asan.cpp b/debuggerd/libdebuggerd/gwp_asan.cpp index f27136558f..9750fc4b04 100644 --- a/debuggerd/libdebuggerd/gwp_asan.cpp +++ b/debuggerd/libdebuggerd/gwp_asan.cpp @@ -72,8 +72,8 @@ GwpAsanCrashData::GwpAsanCrashData(unwindstack::Memory* process_memory, // Get the external crash address from the thread info. crash_address_ = 0u; - if (signal_has_si_addr(thread_info.siginfo)) { - crash_address_ = reinterpret_cast<uintptr_t>(thread_info.siginfo->si_addr); + if (process_info.has_fault_address) { + crash_address_ = process_info.untagged_fault_address; } // Ensure the error belongs to GWP-ASan. |