From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752502AbdC0Jd6 (ORCPT ); Mon, 27 Mar 2017 05:33:58 -0400 Received: from mail.skyhub.de ([5.9.137.197]:47348 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752447AbdC0Jdv (ORCPT ); Mon, 27 Mar 2017 05:33:51 -0400 From: Borislav Petkov To: X86 ML Cc: linux-edac , LKML Subject: [PATCH 6/6] x86/mce: Do not register notifiers with invalid prio Date: Mon, 27 Mar 2017 11:33:04 +0200 Message-Id: <20170327093304.10683-7-bp@alien8.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170327093304.10683-1-bp@alien8.de> References: <20170327093304.10683-1-bp@alien8.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov This is just a defensive precaution: do not register notifiers with a priority which would disrupt the error handling in the notifiers with prio higher than MCE_PRIO_EDAC. Signed-off-by: Borislav Petkov --- arch/x86/kernel/cpu/mcheck/mce.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 8e119156429b..4b57b8336ecd 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -157,9 +157,10 @@ static atomic_t num_notifiers; void mce_register_decode_chain(struct notifier_block *nb) { - atomic_inc(&num_notifiers); + if (WARN_ON(nb->priority > MCE_PRIO_LOWEST && nb->priority < MCE_PRIO_EDAC)) + return; - WARN_ON(nb->priority > MCE_PRIO_LOWEST && nb->priority < MCE_PRIO_EDAC); + atomic_inc(&num_notifiers); atomic_notifier_chain_register(&x86_mce_decoder_chain, nb); } -- 2.11.0