Skip to content

Commit 788b70b

Browse files
committed
x86/bugs: Report correct retbleed mitigation status
JIRA: https://issues.redhat.com/browse/RHEL-119227 commit 930f236 Author: David Kaplan <david.kaplan@amd.com> Date: Mon, 15 Sep 2025 08:47:06 -0500 x86/bugs: Report correct retbleed mitigation status On Intel CPUs, the default retbleed mitigation is IBRS/eIBRS but this requires that a similar spectre_v2 mitigation is applied. If the user selects a different spectre_v2 mitigation (like spectre_v2=retpoline) a warning is printed but sysfs will still report 'Mitigation: IBRS' or 'Mitigation: Enhanced IBRS'. This is incorrect because retbleed is not mitigated, and IBRS is not actually set. Fix this by choosing RETBLEED_MITIGATION_NONE in this scenario so the kernel correctly reports the system as vulnerable to retbleed. Signed-off-by: David Kaplan <david.kaplan@amd.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/20250915134706.3201818-1-david.kaplan@amd.com Signed-off-by: Waiman Long <longman@redhat.com>
1 parent 2ddcb08 commit 788b70b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

arch/x86/kernel/cpu/bugs.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1462,8 +1462,10 @@ static void __init retbleed_update_mitigation(void)
14621462
retbleed_mitigation = RETBLEED_MITIGATION_EIBRS;
14631463
break;
14641464
default:
1465-
if (retbleed_mitigation != RETBLEED_MITIGATION_STUFF)
1465+
if (retbleed_mitigation != RETBLEED_MITIGATION_STUFF) {
14661466
pr_err(RETBLEED_INTEL_MSG);
1467+
retbleed_mitigation = RETBLEED_MITIGATION_NONE;
1468+
}
14671469
}
14681470
}
14691471

0 commit comments

Comments
 (0)