]> www.infradead.org Git - users/jedix/linux-maple.git/commit
x86/spectre: Add missing family 6 check to microcode check
authorAndi Kleen <ak@linux.intel.com>
Fri, 24 Aug 2018 17:03:51 +0000 (10:03 -0700)
committerBrian Maly <brian.maly@oracle.com>
Wed, 5 Sep 2018 17:13:12 +0000 (13:13 -0400)
commit07864ac6e95432d174999a7eb9e1c2bc9c2fe9cf
treec2fd6b9db64ff6ef91c6afd28b1986995b0f5fb4
parent00b024bbb5e6b4c72c64d0e112a8a92196262d81
x86/spectre: Add missing family 6 check to microcode check

The check for Spectre microcodes does not check for family 6, only the
model numbers.

Add a family 6 check to avoid ambiguity with other families.

Fixes: a5b296636453 ("x86/cpufeature: Blacklist SPEC_CTRL/PRED_CMD on early Spectre v2 microcodes")
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: x86@kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20180824170351.34874-2-andi@firstfloor.org
(cherry picked from commit 1ab534e85c93945f7862378d8c8adcf408205b19)

Orabug: 28488808
CVE: CVE-2018-3620

Signed-off-by: Mihai Carabas <mihai.carabas@oracle.com>
Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Conflicts: bad_spectre_microcode was in arch/x86/kernel/cpu/scattered.c
Signed-off-by: Brian Maly <brian.maly@oracle.com>
arch/x86/kernel/cpu/scattered.c