summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-04-09 19:32:41 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-04-10 16:36:08 +0200
commit6d9ef0c36980ef051cb55aeefb6438429e37268a (patch)
treeea5943d2d0b159893b44524a2309dfb95823002e
parentcb238e95ee72a64e53a4f93181aae634cc0d3be6 (diff)
downloadlinux-stable-6d9ef0c36980ef051cb55aeefb6438429e37268a.tar.gz
linux-stable-6d9ef0c36980ef051cb55aeefb6438429e37268a.tar.bz2
linux-stable-6d9ef0c36980ef051cb55aeefb6438429e37268a.zip
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>
-rw-r--r--arch/x86/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b3cd308d7d25..b4e6859542a3 100644
--- 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