commit 3936985e75eace1adeeb8d64d4c98e737318d284
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 13 21:58:58 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 13 21:58:58 2020 +0000
tree 9237d67781fe515508d577a7ba09660204de2a45
parent 1c502d46b35892dd00728c31b00e9c5fa99fb2eb
parent 03d89a706846e85f63721d452c43fd37be05f2ac

Merge "Disable HWASAN on ifunc resolvers."

libc/private/bionic_ifuncs.h

diff --git a/libc/private/bionic_ifuncs.h b/libc/private/bionic_ifuncs.h
index f175bec..e6b349a 100644
--- a/libc/private/bionic_ifuncs.h
+++ b/libc/private/bionic_ifuncs.h
@@ -40,9 +40,12 @@
 #define IFUNC_ARGS ()
 #endif
 
+// We can't have HWASAN enabled in resolvers because they may be called before HWASAN is
+// initialized.
 #define DEFINE_IFUNC_FOR(name) \
     name##_func name __attribute__((ifunc(#name "_resolver"))); \
     __attribute__((visibility("hidden"))) \
+    __attribute__((no_sanitize("hwaddress"))) \
     name##_func* name##_resolver IFUNC_ARGS
 
 #define DECLARE_FUNC(type, name) \