From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755935AbcLZWFE (ORCPT ); Mon, 26 Dec 2016 17:05:04 -0500 Received: from Galois.linutronix.de ([146.0.238.70]:40017 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755691AbcLZWFB (ORCPT ); Mon, 26 Dec 2016 17:05:01 -0500 Message-Id: <20161226220019.772709435@linutronix.de> User-Agent: quilt/0.63-1 Date: Mon, 26 Dec 2016 22:58:20 +0100 From: Thomas Gleixner To: Linus Torvalds Cc: LKML , Ingo Molnar , Borislav Petkov , Peter Zijlstra , Markus Trippelsdorf , Boris Ostrovsky Subject: [patch 2/2] x86/mce/AMD: Make the init code more robust References: <20161226215818.438870590@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=x86-mce-AMD--Make-the-init-code-more-robust.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If mce_device_init() fails then the mce device pointer is NULL and the AMD mce code happily dereferences it. Add a sanity check. Reported-by: Markus Trippelsdorf Reported-by: Boris Ostrovsky Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/mcheck/mce_amd.c | 3 +++ 1 file changed, 3 insertions(+) --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -1182,6 +1182,9 @@ static int threshold_create_bank(unsigne const char *name = get_name(bank, NULL); int err = 0; + if (!dev) + return -ENODEV; + if (is_shared_bank(bank)) { nb = node_to_amd_nb(amd_get_nb_id(cpu));