commit 5e136179d747560aa77405406addc70862113fbb
author Florian Mayer <fmayer@google.com> Fri Mar 07 15:34:05 2025 -0800
committer Florian Mayer <fmayer@google.com> Mon Mar 10 13:02:46 2025 -0700
tree aae0b0b996014ea84c5009ea95a8b0befdda4d54
parent fcdbee322188e616da2c7a3be72eebc6801e12f6

[HWASan] [MTE] disable MTE for HWASan binaries

Bug: 389848256
Test: atest hwasan_test with persist.arm64.memtag.default=sync
Test: atest bionic-unit-tests[-static]
Change-Id: I871932af1ed763e3b7d5f580052a009d5aa02e7d

libc/bionic/libc_init_mte.cpp

diff --git a/libc/bionic/libc_init_mte.cpp b/libc/bionic/libc_init_mte.cpp
index eda2eec..d23b056 100644
--- a/libc/bionic/libc_init_mte.cpp
+++ b/libc/bionic/libc_init_mte.cpp
@@ -246,6 +246,7 @@
 __attribute__((no_sanitize("hwaddress", "memtag"))) void __libc_init_mte(
     const memtag_dynamic_entries_t* memtag_dynamic_entries, const void* phdr_start, size_t phdr_ct,
     uintptr_t load_bias) {
+  if (__libc_shared_globals()->is_hwasan) return;
   bool memtag_stack = false;
   HeapTaggingLevel level =
       __get_tagging_level(memtag_dynamic_entries, phdr_start, phdr_ct, load_bias, &memtag_stack);