summaryrefslogtreecommitdiff
path: root/arch/x86/configs
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2024-05-01 22:37:12 +0300
committerKees Cook <keescook@chromium.org>2024-05-01 22:38:14 +0300
commita284e43852380ab71eeb996389e01992d74a8dde (patch)
treed6e06644741e293066c71501f65c8b96dc73a7b6 /arch/x86/configs
parentfb28a8862dc4b5bf8e44578338f35d9c6c68339d (diff)
downloadlinux-a284e43852380ab71eeb996389e01992d74a8dde.tar.xz
hardening: Enable KCFI and some other options
Add some stuff that got missed along the way: - CONFIG_UNWIND_PATCH_PAC_INTO_SCS=y so SCS vs PAC is hardware selectable. - CONFIG_X86_KERNEL_IBT=y while a default, just be sure. - CONFIG_CFI_CLANG=y globally. - CONFIG_PAGE_TABLE_CHECK=y for userspace mapping sanity. Reviewed-by: Nathan Chancellor <nathan@kernel.org> Link: https://lore.kernel.org/r/20240501193709.make.982-kees@kernel.org Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'arch/x86/configs')
-rw-r--r--arch/x86/configs/hardening.config3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/configs/hardening.config b/arch/x86/configs/hardening.config
index 7b497f3b7bc3..de319852a1e9 100644
--- a/arch/x86/configs/hardening.config
+++ b/arch/x86/configs/hardening.config
@@ -10,5 +10,8 @@ CONFIG_INTEL_IOMMU_DEFAULT_ON=y
CONFIG_INTEL_IOMMU_SVM=y
CONFIG_AMD_IOMMU=y
+# Enforce CET Indirect Branch Tracking in the kernel.
+CONFIG_X86_KERNEL_IBT=y
+
# Enable CET Shadow Stack for userspace.
CONFIG_X86_USER_SHADOW_STACK=y