From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 9 Apr 2024 17:34:55 +0000 (+0200)
Subject: 6.6-stable patches
X-Git-Tag: v5.15.154~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=742f5e897f53459b73f0533c70c8737d73ac2254;p=thirdparty%2Fkernel%2Fstable-queue.git

6.6-stable patches

added patches:
	x86-set-spectre_bhi_on-as-default.patch
---

diff --git a/queue-6.6/series b/queue-6.6/series
index 69fb512ca3a..6483dfdd19f 100644
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -252,3 +252,4 @@ x86-bhi-enumerate-branch-history-injection-bhi-bug.patch
 x86-bhi-add-bhi-mitigation-knob.patch
 x86-bhi-mitigate-kvm-by-default.patch
 kvm-x86-add-bhi_no.patch
+x86-set-spectre_bhi_on-as-default.patch
diff --git a/queue-6.6/x86-set-spectre_bhi_on-as-default.patch b/queue-6.6/x86-set-spectre_bhi_on-as-default.patch
new file mode 100644
index 00000000000..e08fa042ba7
--- /dev/null
+++ b/queue-6.6/x86-set-spectre_bhi_on-as-default.patch
@@ -0,0 +1,28 @@
+From foo@baz Tue Apr  9 07:32:41 PM CEST 2024
+Date: Tue, 09 Apr 2024 19:32:41 +0200
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: x86: set SPECTRE_BHI_ON as default
+
+commit 2bb69f5fc72183e1c62547d900f560d0e9334925 upstream.
+
+Part of a merge commit from Linus that adjusted the default setting of
+SPECTRE_BHI_ON.
+
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -2569,7 +2569,7 @@ config MITIGATION_RFDS
+ choice
+ 	prompt "Clear branch history"
+ 	depends on CPU_SUP_INTEL
+-	default SPECTRE_BHI_AUTO
++	default SPECTRE_BHI_ON
+ 	help
+ 	  Enable BHI mitigations. BHI attacks are a form of Spectre V2 attacks
+ 	  where the branch history buffer is poisoned to speculatively steer