From 2be286b89b69c39c54ba79162dc7cb5745527e95 Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Mon, 7 Oct 2024 13:15:24 +0000 Subject: [PATCH] ANDROID: Explicitly disable CFI_ICALL_NORMALIZE_INTEGERS on arm64 This feature is defined as incompatible with KASAN, which is enabled for arm64 GKI kernels. Until this is worked out, keep the option disabled. Bug: 367265496 Bug: 359429865 Change-Id: I4528cb5ed75d1c324c86040be088ba27f2f48a73 Signed-off-by: Matthias Maennich --- arch/arm64/configs/gki_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 46b3d22259a5..d66413fbd026 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -91,7 +91,6 @@ 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