[tip:ras/core] x86/mce: Do not register notifiers with invalid prio

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	tip-bot for Borislav Petkov <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:ras/core] x86/mce: Do not register notifiers with invalid prio
Date	Tue, 28 Mar 2017 09:10:02 +0200
Message-ID	<tpTqq-41Y-15@gated-at.bofh.it> (permalink)
References	<tpzi2-5Ua-19@gated-at.bofh.it>
X-Original-To	linux-tip-commits@vger.kernel.org
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
Git-Commit-ID	32b40a82e84414499bb4d635cafb9de9e45e6c38
X-Mailer	tip-git-log-daemon
Robot-ID	<tip-bot.git.kernel.org>
Robot-Unsubscribe	Contact <mailto:hpa@kernel.org> 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	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	41
Organization	linux.* mail to news gateway
X-Original-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
X-Original-Date	Tue, 28 Mar 2017 00:04:05 -0700
X-Original-Message-ID	<tip-32b40a82e84414499bb4d635cafb9de9e45e6c38@git.kernel.org>
X-Original-References	<20170327093304.10683-7-bp@alien8.de>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1610373

Show key headers only | View raw

Commit-ID:  32b40a82e84414499bb4d635cafb9de9e45e6c38
Gitweb:     http://git.kernel.org/tip/32b40a82e84414499bb4d635cafb9de9e45e6c38
Author:     Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 27 Mar 2017 11:33:04 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
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 <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/20170327093304.10683-7-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 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);
 }

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 6/6] x86/mce: Do not register notifiers with invalid prio Borislav Petkov <bp@alien8.de> - 2017-03-27 11:40 +0200
  [tip:ras/core] x86/mce: Do not register notifiers with invalid prio tip-bot for Borislav Petkov <tipbot@zytor.com> - 2017-03-28 09:10 +0200

csiph-web