From 965dff4e922a1f45ac7dab2bbc222a33314d8173 Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Thu, 25 Mar 2021 17:47:07 -0700 Subject: [PATCH] Revert "Revert "ANDROID: GKI: Enable bounds sanitizer"" This reverts commit 8cf94785bb927e64b7c8835c8d692c1c2283d670. Signed-off-by: Todd Kjos Change-Id: Ie94f8c1584232839edf37290b0e7dd11c7814035 --- arch/arm64/configs/gki_defconfig | 4 ++++ arch/x86/configs/gki_defconfig | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 255e0d29f281..3f3e4f255f98 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -629,6 +629,10 @@ 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 642946efb2ec..79f33bf2c8a5 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -571,6 +571,10 @@ 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