diff options
author | Borislav Petkov | 2017-03-27 11:33:04 +0200 |
---|---|---|
committer | Ingo Molnar | 2017-03-28 08:55:15 +0200 |
commit | 32b40a82e84414499bb4d635cafb9de9e45e6c38 (patch) | |
tree | 7007ad416e59103d8f1bcefc5b23d871434ce8b7 /arch/x86/kernel/cpu/mcheck/mce.c | |
parent | x86/mce: Factor out and deprecate the /dev/mcelog driver (diff) | |
download | kernel-qcow2-linux-32b40a82e84414499bb4d635cafb9de9e45e6c38.tar.gz kernel-qcow2-linux-32b40a82e84414499bb4d635cafb9de9e45e6c38.tar.xz kernel-qcow2-linux-32b40a82e84414499bb4d635cafb9de9e45e6c38.zip |
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>
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce.c')
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 36082c7fe4a0..a09bb6775c23 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); } |