lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 063/717] x86/mce: Correct the detection of invalid notifier priorities
    Date
    From: Zhen Lei <thunder.leizhen@huawei.com>

    [ Upstream commit 15af36596ae305aefc8c502c2d3e8c58221709eb ]

    Commit

    c9c6d216ed28 ("x86/mce: Rename "first" function as "early"")

    changed the enumeration of MCE notifier priorities. Correct the check
    for notifier priorities to cover the new range.

    [ bp: Rewrite commit message, remove superfluous brackets in
    conditional. ]

    Fixes: c9c6d216ed28 ("x86/mce: Rename "first" function as "early"")
    Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Link: https://lkml.kernel.org/r/20201106141216.2062-2-thunder.leizhen@huawei.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/include/asm/mce.h | 3 ++-
    arch/x86/kernel/cpu/mce/core.c | 3 ++-
    2 files changed, 4 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
    index a0f147893a041..fc25c88c7ff29 100644
    --- a/arch/x86/include/asm/mce.h
    +++ b/arch/x86/include/asm/mce.h
    @@ -177,7 +177,8 @@ enum mce_notifier_prios {
    MCE_PRIO_EXTLOG,
    MCE_PRIO_UC,
    MCE_PRIO_EARLY,
    - MCE_PRIO_CEC
    + MCE_PRIO_CEC,
    + MCE_PRIO_HIGHEST = MCE_PRIO_CEC
    };

    struct notifier_block;
    diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
    index 32b7099e35111..311688202ea51 100644
    --- a/arch/x86/kernel/cpu/mce/core.c
    +++ b/arch/x86/kernel/cpu/mce/core.c
    @@ -162,7 +162,8 @@ EXPORT_SYMBOL_GPL(mce_log);

    void mce_register_decode_chain(struct notifier_block *nb)
    {
    - if (WARN_ON(nb->priority > MCE_PRIO_MCELOG && nb->priority < MCE_PRIO_EDAC))
    + if (WARN_ON(nb->priority < MCE_PRIO_LOWEST ||
    + nb->priority > MCE_PRIO_HIGHEST))
    return;

    blocking_notifier_chain_register(&x86_mce_decoder_chain, nb);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:05    [W:2.838 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site