Author: Jason Molenda Date: 2023-01-04T13:51:26-08:00 New Revision: da4e82753f3130ca2ff973ad90092ad1c035038a
URL: https://github.com/llvm/llvm-project/commit/da4e82753f3130ca2ff973ad90092ad1c035038a DIFF: https://github.com/llvm/llvm-project/commit/da4e82753f3130ca2ff973ad90092ad1c035038a.diff LOG: Don't read off end of GPR register array to access fp/sp/lr/pc The arm64 register context on Darwin has the 29 general purpose registers, then pc/sp/lr/fp with different field names depending on compile-time flags. Instead of accessing beyond the end of the uint64_t[29] array, and upsetting the sanitizers, access those registers correctly with the correct name. Fixes a test failure on the ASAN CI bot, currently being skipped, in TestEarlyProcessLaunch.py. Differential Revision: https://reviews.llvm.org/D140067 rdar://103359354 Added: Modified: lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp Removed: ################################################################################ diff --git a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp index 5a8a256948023..c195a145c3be4 100644 --- a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp +++ b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp @@ -2022,10 +2022,41 @@ bool DNBArchMachARM64::GetRegisterValue(uint32_t set, uint32_t reg, switch (set) { case e_regSetGPR: if (reg <= gpr_pc) { - if (reg == gpr_pc || reg == gpr_lr || reg == gpr_sp || reg == gpr_fp) - value->value.uint64 = clear_pac_bits(m_state.context.gpr.__x[reg]); - else + switch (reg) { +#if __has_feature(ptrauth_calls) && defined(__LP64__) + case gpr_pc: + value->value.uint64 = clear_pac_bits( + reinterpret_cast<uint64_t>(m_state.context.gpr.__opaque_pc)); + break; + case gpr_lr: + value->value.uint64 = clear_pac_bits( + reinterpret_cast<uint64_t>(m_state.context.gpr.__opaque_lr)); + break; + case gpr_sp: + value->value.uint64 = clear_pac_bits( + reinterpret_cast<uint64_t>(m_state.context.gpr.__opaque_sp)); + break; + case gpr_fp: + value->value.uint64 = clear_pac_bits( + reinterpret_cast<uint64_t>(m_state.context.gpr.__opaque_fp)); + break; +#else + case gpr_pc: + value->value.uint64 = clear_pac_bits(m_state.context.gpr.__pc); + break; + case gpr_lr: + value->value.uint64 = clear_pac_bits(m_state.context.gpr.__lr); + break; + case gpr_sp: + value->value.uint64 = clear_pac_bits(m_state.context.gpr.__sp); + break; + case gpr_fp: + value->value.uint64 = clear_pac_bits(m_state.context.gpr.__fp); + break; +#endif + default: value->value.uint64 = m_state.context.gpr.__x[reg]; + } return true; } else if (reg == gpr_cpsr) { value->value.uint32 = m_state.context.gpr.__cpsr; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
