x86/vmscape: Add old Intel CPUs to affected list

Commit 8a68d64bb10334426834e8c273319601878e961e upstream.

These old CPUs are not tested against VMSCAPE, but are likely vulnerable.

Signed-off-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 28823a8e777116c37f5332483c9abbb8a06119f9..bc51fccba4cb638a1b25373e300c4f775f022fd5 100644 (file)
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1239,15 +1239,18 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {
 #define VMSCAPE                BIT(11)
 
 static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = {
-       VULNBL_INTEL_STEPPINGS(INTEL_IVYBRIDGE,         X86_STEPPING_ANY,               SRBDS),
-       VULNBL_INTEL_STEPPINGS(INTEL_HASWELL,           X86_STEPPING_ANY,               SRBDS),
-       VULNBL_INTEL_STEPPINGS(INTEL_HASWELL_L,         X86_STEPPING_ANY,               SRBDS),
-       VULNBL_INTEL_STEPPINGS(INTEL_HASWELL_G,         X86_STEPPING_ANY,               SRBDS),
-       VULNBL_INTEL_STEPPINGS(INTEL_HASWELL_X,         X86_STEPPING_ANY,               MMIO),
-       VULNBL_INTEL_STEPPINGS(INTEL_BROADWELL_D,       X86_STEPPING_ANY,               MMIO),
-       VULNBL_INTEL_STEPPINGS(INTEL_BROADWELL_G,       X86_STEPPING_ANY,               SRBDS),
-       VULNBL_INTEL_STEPPINGS(INTEL_BROADWELL_X,       X86_STEPPING_ANY,               MMIO),
-       VULNBL_INTEL_STEPPINGS(INTEL_BROADWELL,         X86_STEPPING_ANY,               SRBDS),
+       VULNBL_INTEL_STEPPINGS(INTEL_SANDYBRIDGE_X,     X86_STEPPING_ANY,               VMSCAPE),
+       VULNBL_INTEL_STEPPINGS(INTEL_SANDYBRIDGE,       X86_STEPPING_ANY,               VMSCAPE),
+       VULNBL_INTEL_STEPPINGS(INTEL_IVYBRIDGE_X,       X86_STEPPING_ANY,               VMSCAPE),
+       VULNBL_INTEL_STEPPINGS(INTEL_IVYBRIDGE,         X86_STEPPING_ANY,               SRBDS | VMSCAPE),
+       VULNBL_INTEL_STEPPINGS(INTEL_HASWELL,           X86_STEPPING_ANY,               SRBDS | VMSCAPE),
+       VULNBL_INTEL_STEPPINGS(INTEL_HASWELL_L,         X86_STEPPING_ANY,               SRBDS | VMSCAPE),
+       VULNBL_INTEL_STEPPINGS(INTEL_HASWELL_G,         X86_STEPPING_ANY,               SRBDS | VMSCAPE),
+       VULNBL_INTEL_STEPPINGS(INTEL_HASWELL_X,         X86_STEPPING_ANY,               MMIO | VMSCAPE),
+       VULNBL_INTEL_STEPPINGS(INTEL_BROADWELL_D,       X86_STEPPING_ANY,               MMIO | VMSCAPE),
+       VULNBL_INTEL_STEPPINGS(INTEL_BROADWELL_X,       X86_STEPPING_ANY,               MMIO | VMSCAPE),
+       VULNBL_INTEL_STEPPINGS(INTEL_BROADWELL_G,       X86_STEPPING_ANY,               SRBDS | VMSCAPE),
+       VULNBL_INTEL_STEPPINGS(INTEL_BROADWELL,         X86_STEPPING_ANY,               SRBDS | VMSCAPE),
        VULNBL_INTEL_STEPPINGS(INTEL_SKYLAKE_X,         X86_STEPPINGS(0x0, 0x5),        MMIO | RETBLEED | GDS | VMSCAPE),
        VULNBL_INTEL_STEPPINGS(INTEL_SKYLAKE_X,         X86_STEPPING_ANY,               MMIO | RETBLEED | GDS | ITS | VMSCAPE),
        VULNBL_INTEL_STEPPINGS(INTEL_SKYLAKE_L,         X86_STEPPING_ANY,               MMIO | RETBLEED | GDS | SRBDS | VMSCAPE),