Use attack vector controls to determine if srso mitigation is required.
Signed-off-by: David Kaplan <david.kaplan@amd.com>
---
arch/x86/kernel/cpu/bugs.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 2e3b4d768d6b..91e00d4de8df 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -2922,8 +2922,14 @@ static void __init srso_select_mitigation(void)
if (srso_mitigation == SRSO_MITIGATION_NONE)
return;
- if (srso_mitigation == SRSO_MITIGATION_AUTO)
- srso_mitigation = SRSO_MITIGATION_SAFE_RET;
+ if (srso_mitigation == SRSO_MITIGATION_AUTO) {
+ if (should_mitigate_vuln(X86_BUG_SRSO))
+ srso_mitigation = SRSO_MITIGATION_SAFE_RET;
+ else {
+ srso_mitigation = SRSO_MITIGATION_NONE;
+ return;
+ }
+ }
if (has_microcode) {
/*
--
2.34.1