]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
x86/mce: Do not overwrite no_way_out if mce_end() fails
authorGabriele Paoloni <gabriele.paoloni@intel.com>
Fri, 27 Nov 2020 16:18:15 +0000 (16:18 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 Dec 2020 07:52:02 +0000 (08:52 +0100)
commitc30b19ac6caecbdb7d57e769cc0fc18dd468ea97
tree98ef56498d75d97eea9937dc606c566b00e4c765
parent4e184c914a74753a4a8ebd235af45da2e433f0b3
x86/mce: Do not overwrite no_way_out if mce_end() fails

commit 25bc65d8ddfc17cc1d7a45bd48e9bdc0e729ced3 upstream.

Currently, if mce_end() fails, no_way_out - the variable denoting
whether the machine can recover from this MCE - is determined by whether
the worst severity that was found across the MCA banks associated with
the current CPU, is of panic severity.

However, at this point no_way_out could have been already set by
mca_start() after looking at all severities of all CPUs that entered the
MCE handler. If mce_end() fails, check first if no_way_out is already
set and, if so, stick to it, otherwise use the local worst value.

 [ bp: Massage. ]

Signed-off-by: Gabriele Paoloni <gabriele.paoloni@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Tony Luck <tony.luck@intel.com>
Cc: <stable@vger.kernel.org>
Link: https://lkml.kernel.org/r/20201127161819.3106432-2-gabriele.paoloni@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kernel/cpu/mce/core.c