commit e2d50fe622ea9571004a76e1eaa2630e5333d49b
author Florian Mayer <fmayer@google.com> Fri Apr 29 14:05:24 2022 -0700
committer Florian Mayer <fmayer@google.com> Mon May 02 18:35:50 2022 +0000
tree 012bccf55d3674f7408c5b7d7bc02af5ab3173ef
parent 668c0619862af42c010e01b8c0e1797d5df93529

Properly fix heap_tagging_helper for HWASan.

Test: atest bionic-unit-tests
Change-Id: Ia9fbb436676257810d1c379d5d65dd7ccfcf90ac

tests/libs/heap_tagging_helper.cpp

diff --git a/tests/libs/heap_tagging_helper.cpp b/tests/libs/heap_tagging_helper.cpp
index 5b7890e..ed5601a 100644
--- a/tests/libs/heap_tagging_helper.cpp
+++ b/tests/libs/heap_tagging_helper.cpp
@@ -44,11 +44,15 @@
   _exit(0);
 }
 
-__attribute__((optnone)) __attribute__((no_sanitize("hwaddress"))) int main() {
+__attribute__((optnone)) int main() {
   struct sigaction sa = {};
   sa.sa_sigaction = action;
   sa.sa_flags = SA_SIGINFO;
   sigaction(SIGSEGV, &sa, nullptr);
+  // suppress HWASan crash in logcat / tombstone.
+  struct sigaction dfl_sa = {};
+  dfl_sa.sa_handler = SIG_DFL;
+  sigaction(SIGABRT, &dfl_sa, nullptr);
 
   std::unique_ptr<int[]> p = std::make_unique<int[]>(4);
   volatile int oob = p[-1];