From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754647AbdC1HHw (ORCPT ); Tue, 28 Mar 2017 03:07:52 -0400 Received: from terminus.zytor.com ([65.50.211.136]:34453 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754389AbdC1HHu (ORCPT ); Tue, 28 Mar 2017 03:07:50 -0400 Date: Tue, 28 Mar 2017 00:04:05 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: torvalds@linux-foundation.org, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org, linux-edac@vger.kernel.org, bp@suse.de Reply-To: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, bp@suse.de, linux-edac@vger.kernel.org, peterz@infradead.org, mingo@kernel.org, tglx@linutronix.de In-Reply-To: <20170327093304.10683-7-bp@alien8.de> References: <20170327093304.10683-7-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/mce: Do not register notifiers with invalid prio Git-Commit-ID: 32b40a82e84414499bb4d635cafb9de9e45e6c38 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 32b40a82e84414499bb4d635cafb9de9e45e6c38 Gitweb: http://git.kernel.org/tip/32b40a82e84414499bb4d635cafb9de9e45e6c38 Author: Borislav Petkov AuthorDate: Mon, 27 Mar 2017 11:33:04 +0200 Committer: Ingo Molnar CommitDate: Tue, 28 Mar 2017 08:55:15 +0200 x86/mce: Do not register notifiers with invalid prio 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 Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-edac Link: http://lkml.kernel.org/r/20170327093304.10683-7-bp@alien8.de Signed-off-by: Ingo Molnar --- 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 36082c7..a09bb67 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); }