From: Peter Müller Date: Sun, 9 Jul 2023 14:55:00 +0000 (+0000) Subject: linux: Enable Indirect Branch Tracking by default X-Git-Tag: v2.27-core177~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c084d8f970b428ef043aab0263c0f2a8c2f814f5;p=ipfire-2.x.git linux: Enable Indirect Branch Tracking by default This became upstream default (see https://www.phoronix.com/news/Linux-IBT-By-Default-Tip for IT news media coverage), and given its security-relevance, we should adopt this setting as well. Signed-off-by: Peter Müller Reviewed-by: Michael Tremer --- diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 3bddd3806f..f4e4584c39 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -431,7 +431,7 @@ CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_X86_UMIP=y CONFIG_CC_HAS_IBT=y -# CONFIG_X86_KERNEL_IBT is not set +CONFIG_X86_KERNEL_IBT=y CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y CONFIG_X86_INTEL_TSX_MODE_OFF=y # CONFIG_X86_INTEL_TSX_MODE_ON is not set diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 2da7da282d..512246b73c 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -11324,6 +11324,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/X86_INTERNODE_CACHE_SHIFT #lib/modules/KVER-ipfire/build/include/config/X86_IOPL_IOPERM #lib/modules/KVER-ipfire/build/include/config/X86_IO_APIC +#lib/modules/KVER-ipfire/build/include/config/X86_KERNEL_IBT #lib/modules/KVER-ipfire/build/include/config/X86_L1_CACHE_SHIFT #lib/modules/KVER-ipfire/build/include/config/X86_LOCAL_APIC #lib/modules/KVER-ipfire/build/include/config/X86_MCE