From dc2d86a874b610bd3afdeb01961a44ecbcb91a30 Mon Sep 17 00:00:00 2001 From: Sami Tolvanen Date: Tue, 13 Dec 2022 12:43:21 -0800 Subject: [PATCH] ANDROID: GKI: Enable CONFIG_CFI_CLANG Enable KCFI. Depends Clang >= 16. Bug: 239452773 Bug: 261067673 Change-Id: Ic27564a6a800120b53a932fb274daa47497e42ad Signed-off-by: Sami Tolvanen --- 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 b20f36830abd..c4919417aba5 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -78,6 +78,7 @@ CONFIG_KVM=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y CONFIG_SHADOW_CALL_STACK=y +CONFIG_CFI_CLANG=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 7104cb48606c..32009d7e745c 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -68,6 +68,7 @@ CONFIG_KVM_INTEL=y CONFIG_KVM_AMD=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y +CONFIG_CFI_CLANG=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y