From ce3cfdc17f2af4de50acfa6c6cb9d5a754c4d8af Mon Sep 17 00:00:00 2001 From: Mitch Phillips Date: Tue, 6 Feb 2024 15:21:48 +0100 Subject: [PATCH] Re-enable MTE stack on fullmte builds. The new toolchain has been rolled, and so we can re-enable stack MTE instrumentation. Bug: 320448268 Bug: 292478827 Test: atest bionic-unit-tests bionic-unit-tests-static \ CtsTaggingHostTestCases debuggerd_test CtsGwpAsanTestCases \ gwp_asan_unittest CtsHostsideWebViewTests # on husky_fullmte Change-Id: Ie238a015edba3c6ca2e1266cee9142b0d8927cc2 --- target/product/fullmte.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/product/fullmte.mk b/target/product/fullmte.mk index 5e2a6949c0..b62249601e 100644 --- a/target/product/fullmte.mk +++ b/target/product/fullmte.mk @@ -20,8 +20,7 @@ # For more details, see: # https://source.android.com/docs/security/test/memory-safety/arm-mte ifeq ($(filter memtag_heap,$(SANITIZE_TARGET)),) - # TODO(b/292478827): Re-enable memtag_stack when new toolchain rolls. - SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) memtag_heap) + SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) memtag_heap memtag_stack) SANITIZE_TARGET_DIAG := $(strip $(SANITIZE_TARGET_DIAG) memtag_heap) endif PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.default=sync