Skip setting seccomp filter under HWASan, same as ASan.

am: 825828c275

Change-Id: I06c0edd1203d99c92bd4effc41507adfaf6b32a7

2 files changed, 5 insertions, 4 deletions

diff --git a/libminijail.c b/libminijail.c
index 144e5da..82ebc33 100644
--- a/libminijail.c
+++ b/libminijail.c
@@ -1841,8 +1841,8 @@ static void set_seccomp_filter(const struct minijail *j)
 	 * build time, so this cannot be used by an attacker to skip setting
 	 * seccomp filter.
 	 */
-	if (j->flags.seccomp_filter && running_with_asan()) {
-		warn("running with ASan, not setting seccomp filter");
+	if (j->flags.seccomp_filter && running_with_asan_or_hwasan()) {
+		warn("running with (HW)ASan, not setting seccomp filter");
 		return;
 	}
 
diff --git a/util.h b/util.h
index e31b8b9..eff2bdf 100644
--- a/util.h
+++ b/util.h
@@ -106,10 +106,11 @@ static inline int is_android(void)
 }
 
 void __asan_init(void) attribute_weak;
+void __hwasan_init(void) attribute_weak;
 
-static inline int running_with_asan(void)
+static inline int running_with_asan_or_hwasan(void)
 {
-	return &__asan_init != 0;
+	return &__asan_init != 0 || &__hwasan_init != 0;
 }
 
 int lookup_syscall(const char *name);