From 553b2422dfed8f72ebdd47a87e2a22e7bec9a11f Mon Sep 17 00:00:00 2001 From: Aleksei Vetrov Date: Mon, 11 Nov 2024 17:37:22 +0000 Subject: [PATCH] ANDROID: re-enable UBSAN_TRAP After updating Clang we had to temporary disable UBSAN kernel panic until we fix new issues that were triggering UBSAN, namely signed integer overflow and `__counted_by` annotated arrays. These issues are now fixed and UBSAN kernel panic can be re-enabled. Bug: 354745907 Bug: 375156207 Change-Id: Iaa4e7109e6ecc6b8a34d30ac3aadf180468c9e72 Signed-off-by: Aleksei Vetrov --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index a6c3b552cc53..a73533761db7 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -723,6 +723,7 @@ 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_SIGNED_WRAP is not set # CONFIG_UBSAN_BOOL is not set # CONFIG_UBSAN_ENUM is not set diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 1d75f936b308..2efcbf2282a4 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -666,6 +666,7 @@ 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_SIGNED_WRAP is not set # CONFIG_UBSAN_BOOL is not set # CONFIG_UBSAN_ENUM is not set