From 70df9211dfd23dcca49559b755fcbedca90eeb7c Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Thu, 25 Jul 2024 13:02:20 +0000 Subject: [PATCH] ANDROID: gki_defconfig: cfi: unconditionally normalize integers The -fsanitize-cfi-icall-experimental-normalize-integers flag must be passed to clang for it to be possible to use Rust in the kernel when CFI is enabled. However, only passing this flag when CONFIG_RUST is enabled is undesirable because it affects the ABI of C code. Enabling the flag unconditionally allows us to toggle CONFIG_RUST without having it change the ABI of existing C code. This helps prevent b/350371019 from happening again in the future. Bug: 350943879 Change-Id: I773d1c70df50d0879b141ba02fc3f096c48ab169 Signed-off-by: Alice Ryhl --- 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 df8d2452de8a..ea0bbf35583c 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -89,6 +89,7 @@ CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y CONFIG_SHADOW_CALL_STACK=y CONFIG_CFI_CLANG=y +CONFIG_CFI_ICALL_NORMALIZE_INTEGERS=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index f3aefde25f8f..390bd98425b4 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -84,6 +84,7 @@ CONFIG_KVM_AMD=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y CONFIG_CFI_CLANG=y +CONFIG_CFI_ICALL_NORMALIZE_INTEGERS=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y