From 85d09a7c4b7a56324af79cf332688fa06c95cdf2 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Thu, 25 Jan 2018 17:10:36 -0500 Subject: [PATCH] x86/spec: Also print IBRS if IBPB is disabled. If ones disables ibpb_enabled the 'spectre_v2' sysfs shows "Vulnerable" but it should say "IBRS" This fixes it. OraBug: 27448313 Reviewed-by: Boris Ostrovsky Signed-off-by: Konrad Rzeszutek Wilk --- arch/x86/kernel/cpu/bugs_64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs_64.c b/arch/x86/kernel/cpu/bugs_64.c index 6dfbcadd74e4..2a79f3692c6e 100644 --- a/arch/x86/kernel/cpu/bugs_64.c +++ b/arch/x86/kernel/cpu/bugs_64.c @@ -146,10 +146,10 @@ ssize_t cpu_show_spectre_v2(struct device *dev, { if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V2)) return sprintf(buf, "Not affected\n"); - if (ibrs_inuse && ibpb_inuse) - return sprintf(buf, "Mitigation: IBRS IBPB\n"); - if (ibpb_inuse && !ibrs_inuse) - return sprintf(buf, "Mitigation: IBPB\n"); + if (ibrs_inuse || ibpb_inuse) + return sprintf(buf, "Mitigation: %s%s\n", + ibrs_inuse ? "IBRS " : "", + ibpb_inuse ? "IBPB" : ""); return sprintf(buf, "Vulnerable\n"); } #endif -- 2.50.1