From 77e037c8876ffacf100f89e47c2f68881f826239 Mon Sep 17 00:00:00 2001 From: Mitch Phillips Date: Mon, 12 Apr 2021 15:35:47 -0700 Subject: [PATCH] [MTE] [CFI] Fix CFI -> diag promotion with memtag_heap. Small typo in the AndroidMk sanitizer config, where adding heap MTE ended up promoting CFI to diagnostic CFI accidentally, where this isn't a valid transformation. Bug: 184397138 Test: lunch aosp_sunfish-userdebug Test: PRODUCT_MEMTAG_HEAP_ASYNC_INCLUDE_PATHS=\ Test: "hardware/qcom frameworks/opt/net/wifi" \ Test: CFI_INCLUDE_PATHS=hardware/qcom \ Test: m libwifi-hal Change-Id: I74a03debf0042f2ee004503dd4a0e81131bd9fde --- core/config_sanitizers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index 228bad682b..69bd16fd23 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -139,7 +139,7 @@ ifeq ($(filter memtag_heap, $(my_sanitize)),) ifneq ($(strip $(foreach dir,$(subst $(comma),$(space),$(combined_sync_include_paths)),\ $(filter $(dir)%,$(LOCAL_PATH)))),) my_sanitize := memtag_heap $(my_sanitize) - my_sanitize_diag := memtag_heap $(my_sanitize) + my_sanitize_diag := memtag_heap $(my_sanitize_diag) else ifneq ($(strip $(foreach dir,$(subst $(comma),$(space),$(combined_async_include_paths)),\ $(filter $(dir)%,$(LOCAL_PATH)))),) my_sanitize := memtag_heap $(my_sanitize)