From 8cf94785bb927e64b7c8835c8d692c1c2283d670 Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Wed, 17 Mar 2021 08:38:07 -0700 Subject: [PATCH] Revert "ANDROID: GKI: Enable bounds sanitizer" This reverts commit 5f85626b131a723e93ee0b0e78a14d51addcdd02. Temporarily reverting to let partner stabilize. Planning to re-enable by end of March. Bug: 182884953 Change-Id: Iffa933d7065d206a73750bd546adc71c637e1581 Signed-off-by: Todd Kjos --- arch/arm64/configs/gki_defconfig | 4 ---- arch/x86/configs/gki_defconfig | 4 ---- 2 files changed, 8 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 498a1f6ef634..997fb23db548 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -620,10 +620,6 @@ CONFIG_DEBUG_INFO_DWARF4=y CONFIG_HEADERS_INSTALL=y # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=y -CONFIG_UBSAN=y -CONFIG_UBSAN_TRAP=y -CONFIG_UBSAN_LOCAL_BOUNDS=y -# CONFIG_UBSAN_MISC is not set CONFIG_PAGE_OWNER=y CONFIG_DEBUG_STACK_USAGE=y CONFIG_DEBUG_MEMORY_INIT=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 7aa4f18b7144..1e7481abcca1 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -565,10 +565,6 @@ CONFIG_DEBUG_INFO_DWARF4=y CONFIG_HEADERS_INSTALL=y # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=y -CONFIG_UBSAN=y -CONFIG_UBSAN_TRAP=y -CONFIG_UBSAN_LOCAL_BOUNDS=y -# CONFIG_UBSAN_MISC is not set CONFIG_PAGE_OWNER=y CONFIG_DEBUG_STACK_USAGE=y CONFIG_DEBUG_MEMORY_INIT=y