Skip to content

Commit 01b057b

Browse files
jpoimboebp3tk0v
authored andcommitted
x86/srso: Fix SBPB enablement for spec_rstack_overflow=off
If the user has requested no SRSO mitigation, other mitigations can use the lighter-weight SBPB instead of IBPB. Fixes: fb3bd91 ("x86/srso: Add a Speculative RAS Overflow mitigation") Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Acked-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/b20820c3cfd1003171135ec8d762a0b957348497.1693889988.git.jpoimboe@kernel.org
1 parent 02428d0 commit 01b057b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/kernel/cpu/bugs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2433,7 +2433,7 @@ static void __init srso_select_mitigation(void)
24332433

24342434
switch (srso_cmd) {
24352435
case SRSO_CMD_OFF:
2436-
return;
2436+
goto pred_cmd;
24372437

24382438
case SRSO_CMD_MICROCODE:
24392439
if (has_microcode) {

0 commit comments

Comments
 (0)