From 1f1bff9701cd64239919dcbf75e2b7566740f850 Mon Sep 17 00:00:00 2001 From: Mitch Phillips Date: Fri, 20 Oct 2023 16:57:30 +0000 Subject: [PATCH] Diable memtag_stack on fullmte builds. memtag_stack currently has a miscompile on main that prevents boot. Diable memtag_stack on fullmte builds until a new toolchain gets rolled that has the fixes. Bug: 292478827 Bug: 301328082 Change-Id: I59af848b556088d71971dd1b6d7cc02ef61641b6 Test: Build and boot fullmte off main. --- target/product/fullmte.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/product/fullmte.mk b/target/product/fullmte.mk index d47c685584..5726c06de3 100644 --- a/target/product/fullmte.mk +++ b/target/product/fullmte.mk @@ -20,7 +20,8 @@ # For more details, see: # https://source.android.com/docs/security/test/memory-safety/arm-mte ifeq ($(filter memtag_heap,$(SANITIZE_TARGET)),) - SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) memtag_heap memtag_stack) + # TODO(b/292478827): Re-enable memtag_stack when new toolchain rolls. + SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) memtag_heap) SANITIZE_TARGET_DIAG := $(strip $(SANITIZE_TARGET_DIAG) memtag_heap) endif PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.default=sync