From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 9 Apr 2024 17:32:41 +0000 (+0200)
Subject: x86: set SPECTRE_BHI_ON as default
X-Git-Tag: v6.8.5~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9634ee70691a868737d1e665e3afa5a76f04d523;p=thirdparty%2Fkernel%2Fstable.git

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>
---

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 316b2d2574fc1..890ba8e48bc39 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2615,7 +2615,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