diff options
| author | Peter Collingbourne <pcc@google.com> | 2021-03-08 16:53:54 -0800 |
|---|---|---|
| committer | Peter Collingbourne <pcc@google.com> | 2021-03-16 10:59:39 -0700 |
| commit | 1a1f7d79a4489671c705e6c5f20bb19dc35e8ba6 (patch) | |
| tree | 165c7a9c7f2d92154e93336f3511f7aa9479b3e9 /debuggerd/debuggerd_test.cpp | |
| parent | d5bd5437b0bd0723d8199c332e8766d0b6a9a460 (diff) | |
Support MTE and GWP-ASan features in proto tombstones.
Proto tombstones were missing tagged fault addresses, tagged_addr_ctrl,
tags in memory dumps and Scudo and GWP-ASan error reports. Since text
tombstones now go via protos, all of these features broke when we
switched to text tombstones generated from protos by default. Fix
the features by adding support for them to the proto format,
tombstone_proto and tombstone_proto_to_text.
Bug: 135772972
Bug: 182489365
Change-Id: I3ca854546c38755b1f6410a1f6198a44d25ed1c5
Diffstat (limited to 'debuggerd/debuggerd_test.cpp')
| -rw-r--r-- | debuggerd/debuggerd_test.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/debuggerd/debuggerd_test.cpp b/debuggerd/debuggerd_test.cpp index ab95768de..dcb5395d4 100644 --- a/debuggerd/debuggerd_test.cpp +++ b/debuggerd/debuggerd_test.cpp @@ -423,12 +423,11 @@ TEST_P(SizeParamCrasherTest, mte_uaf) { ASSERT_MATCH(result, R"(signal 11 \(SIGSEGV\))"); ASSERT_MATCH(result, R"(Cause: \[MTE\]: Use After Free, 0 bytes into a )" + - std::to_string(GetParam()) + R"(-byte allocation.* - -allocated by thread .* - #00 pc)"); + std::to_string(GetParam()) + R"(-byte allocation)"); ASSERT_MATCH(result, R"(deallocated by thread .* #00 pc)"); + ASSERT_MATCH(result, R"(allocated by thread .* + #00 pc)"); #else GTEST_SKIP() << "Requires aarch64"; #endif @@ -460,9 +459,8 @@ TEST_P(SizeParamCrasherTest, mte_overflow) { ASSERT_MATCH(result, R"(signal 11 \(SIGSEGV\))"); ASSERT_MATCH(result, R"(Cause: \[MTE\]: Buffer Overflow, 0 bytes right of a )" + - std::to_string(GetParam()) + R"(-byte allocation.* - -allocated by thread .* + std::to_string(GetParam()) + R"(-byte allocation)"); + ASSERT_MATCH(result, R"(allocated by thread .* #00 pc)"); #else GTEST_SKIP() << "Requires aarch64"; @@ -495,9 +493,8 @@ TEST_P(SizeParamCrasherTest, mte_underflow) { ASSERT_MATCH(result, R"(signal 11 \(SIGSEGV\), code 9 \(SEGV_MTESERR\))"); ASSERT_MATCH(result, R"(Cause: \[MTE\]: Buffer Underflow, 4 bytes left of a )" + - std::to_string(GetParam()) + R"(-byte allocation.* - -allocated by thread .* + std::to_string(GetParam()) + R"(-byte allocation)"); + ASSERT_MATCH(result, R"(allocated by thread .* #00 pc)"); #else GTEST_SKIP() << "Requires aarch64"; |