a0f7ab8a6a
cherry-pick from upstream 4.14
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tim Chen <tim.c.chen@linux.intel.com>
|
|
Date: Wed, 27 Sep 2017 12:09:14 -0700
|
|
Subject: [PATCH] x86/feature: Report presence of IBPB and IBRS control
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
CVE-2017-5753
|
|
CVE-2017-5715
|
|
|
|
Report presence of IBPB and IBRS.
|
|
|
|
Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
|
|
Signed-off-by: Andy Whitcroft <apw@canonical.com>
|
|
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
|
|
(cherry picked from commit c41156d893e7f48bebf8d71cfddd39d8fb2724f8)
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
|
---
|
|
arch/x86/kernel/cpu/intel.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
|
|
index dfa90a3a5145..f1d94c73625a 100644
|
|
--- a/arch/x86/kernel/cpu/intel.c
|
|
+++ b/arch/x86/kernel/cpu/intel.c
|
|
@@ -627,6 +627,11 @@ static void init_intel(struct cpuinfo_x86 *c)
|
|
init_intel_energy_perf(c);
|
|
|
|
init_intel_misc_features(c);
|
|
+
|
|
+ if (boot_cpu_has(X86_FEATURE_SPEC_CTRL))
|
|
+ printk_once(KERN_INFO "FEATURE SPEC_CTRL Present\n");
|
|
+ else
|
|
+ printk_once(KERN_INFO "FEATURE SPEC_CTRL Not Present\n");
|
|
}
|
|
|
|
#ifdef CONFIG_X86_32
|
|
--
|
|
2.14.2
|
|
|