lkml.org 
[lkml]   [2018]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 70/80] x86/spectre: Add missing family 6 check to microcode check
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Andi Kleen <ak@linux.intel.com>

    commit 1ab534e85c93945f7862378d8c8adcf408205b19 upstream.

    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
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/kernel/cpu/intel.c | 3 +++
    1 file changed, 3 insertions(+)

    --- a/arch/x86/kernel/cpu/intel.c
    +++ b/arch/x86/kernel/cpu/intel.c
    @@ -74,6 +74,9 @@ static bool bad_spectre_microcode(struct
    if (cpu_has(c, X86_FEATURE_HYPERVISOR))
    return false;

    + if (c->x86 != 6)
    + return false;
    +
    for (i = 0; i < ARRAY_SIZE(spectre_bad_microcodes); i++) {
    if (c->x86_model == spectre_bad_microcodes[i].model &&
    c->x86_mask == spectre_bad_microcodes[i].stepping)

    \
     
     \ /
      Last update: 2018-09-03 19:50    [W:4.168 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site