Up to 6.6; SPECTRE_BHI_ON (default on; follows upstream); fixes CVE-2024-2201

diff --git a/kernel-x86.config b/kernel-x86.config
index 00e0edadaf5694634f3a9cf749f77286404bd132..6ece4839cc7ff4549e8d77e5ab1414f568349c0d 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -72,7 +72,6 @@ PAGE_OFFSET i386=0xC0000000
 X86_5LEVEL x86=n
 X86_CPA_STATISTICS x86=y
 AMD_MEM_ENCRYPT x86=y
-AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT x86=y
 NUMA x86_64=y
 AMD_NUMA x86=n
 X86_64_ACPI_NUMA x86_64=y
@@ -123,6 +122,9 @@ CPU_SRSO x86_64=y
 SLS x86_64=y
 GDS_FORCE_MITIGATION x86_64=n x86=n
 MITIGATION_RFDS x86_64=y
+SPECTRE_BHI_ON x86=y x86_64=y
+SPECTRE_BHI_OFF x86=n x86_64=n
+SPECTRE_BHI_AUTO x86=n x86_64=n
 #- file kernel/power/Kconfig goes here
 #- file drivers/acpi/Kconfig goes here
 APM i386=m
@@ -257,6 +259,7 @@ X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
 #-
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
+AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT x86=y
 BOOTPARAM_HOTPLUG_CPU0 all=n
 DEBUG_HOTPLUG_CPU0 all=n
 KEXEC_JUMP x86=y

diff --git a/kernel.spec b/kernel.spec
index db92f4d5cd3aa801bd34757fd017ed7118478bd8..32cb3280a6827f3e0fb55f04dd5a3f61602a6bd3 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -61,7 +61,7 @@
 
 %define                rel             1
 %define                basever         6.6
-%define                postver         .25
+%define                postver         .26
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       -%{basever}
@@ -115,7 +115,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
 # Source0-md5: 452098d80ba925af3a4ab35998f3aef5
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5:  4db497b4bd0b3f99f81e0555e84733a8
+# Patch0-md5:  380fc1e24364b1a4cff4347bb8f1ed1e
 %endif
 Source1:       kernel.sysconfig