From 7bd26ab0a794612f633457067288e30ed0efd520 Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Fri, 27 Jul 2018 11:58:12 -0700 Subject: [PATCH] Skip memory limits under HWASan, same as ASan. HWASan is a new memory tool with similar properties: it also has a large sparse "shadow" mapping that makes RLIMIT_AS ineffective. Bug: 112438058 Test: mmm SANITIZE_TARGET=hwaddress Change-Id: Iec3dee890e9d5fbdc4fee5e7e59c58ee2b03a0bf --- media/libmedia/MediaUtils.cpp | 2 +- media/libmedia/MediaUtils.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/media/libmedia/MediaUtils.cpp b/media/libmedia/MediaUtils.cpp index bcdc3bdcfe..320c7a9b85 100644 --- a/media/libmedia/MediaUtils.cpp +++ b/media/libmedia/MediaUtils.cpp @@ -34,7 +34,7 @@ void limitProcessMemory( size_t percentageOfTotalMem) { if (running_with_asan()) { - ALOGW("Running with ASan, skip enforcing memory limitations."); + ALOGW("Running with (HW)ASan, skip enforcing memory limitations."); return; } diff --git a/media/libmedia/MediaUtils.h b/media/libmedia/MediaUtils.h index a678bcc3fc..26075c4df6 100644 --- a/media/libmedia/MediaUtils.h +++ b/media/libmedia/MediaUtils.h @@ -20,9 +20,10 @@ namespace android { extern "C" void __asan_init(void) __attribute__((weak)); +extern "C" void __hwasan_init(void) __attribute__((weak)); static inline int running_with_asan() { - return &__asan_init != 0; + return &__asan_init != 0 || &__hwasan_init != 0; } /**