Skip to content

Commit 3fc7b28

Browse files
jpoimboebp3tk0v
authored andcommitted
x86/srso: Print actual mitigation if requested mitigation isn't possible
If the kernel wasn't compiled to support the requested option, print the actual option that ends up getting used. 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> Reviewed-by: Borislav Petkov (AMD) <bp@alien8.de> Acked-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/7e7a12ea9d85a9f76ca16a3efb71f262dee46ab1.1693889988.git.jpoimboe@kernel.org
1 parent 1d1142a commit 3fc7b28

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

arch/x86/kernel/cpu/bugs.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2461,7 +2461,6 @@ static void __init srso_select_mitigation(void)
24612461
srso_mitigation = SRSO_MITIGATION_SAFE_RET;
24622462
} else {
24632463
pr_err("WARNING: kernel not compiled with CPU_SRSO.\n");
2464-
goto pred_cmd;
24652464
}
24662465
break;
24672466

@@ -2473,7 +2472,6 @@ static void __init srso_select_mitigation(void)
24732472
}
24742473
} else {
24752474
pr_err("WARNING: kernel not compiled with CPU_IBPB_ENTRY.\n");
2476-
goto pred_cmd;
24772475
}
24782476
break;
24792477

@@ -2485,7 +2483,6 @@ static void __init srso_select_mitigation(void)
24852483
}
24862484
} else {
24872485
pr_err("WARNING: kernel not compiled with CPU_SRSO.\n");
2488-
goto pred_cmd;
24892486
}
24902487
break;
24912488

0 commit comments

Comments
 (0)