Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77e037c8 authored by Mitch Phillips's avatar Mitch Phillips
Browse files

[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
parent 9910b5e4

core/config_sanitizers.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)