From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932368AbbJUKGh (ORCPT ); Wed, 21 Oct 2015 06:06:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:42181 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932226AbbJUKGf (ORCPT ); Wed, 21 Oct 2015 06:06:35 -0400 Date: Wed, 21 Oct 2015 03:05:48 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: chaowang@redhat.com, jgross@suse.com, msalter@redhat.com, jroedel@suse.de, torvalds@linux-foundation.org, hpa@zytor.com, akpm@linux-foundation.org, mingo@kernel.org, peterz@infradead.org, bp@suse.de, tglx@linutronix.de, jkosina@suse.cz, luto@amacapital.net, linux-kernel@vger.kernel.org, dyoung@redhat.com Reply-To: hpa@zytor.com, mingo@kernel.org, akpm@linux-foundation.org, torvalds@linux-foundation.org, jroedel@suse.de, msalter@redhat.com, chaowang@redhat.com, jgross@suse.com, luto@amacapital.net, tglx@linutronix.de, jkosina@suse.cz, linux-kernel@vger.kernel.org, dyoung@redhat.com, bp@suse.de, peterz@infradead.org In-Reply-To: <1445246268-26285-7-git-send-email-bp@alien8.de> References: <1445246268-26285-7-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/setup/crash: Check memblock_reserve() retval Git-Commit-ID: 6f3760570e26eefc214e641b6daeddb7106240bb 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: 6f3760570e26eefc214e641b6daeddb7106240bb Gitweb: http://git.kernel.org/tip/6f3760570e26eefc214e641b6daeddb7106240bb Author: Borislav Petkov AuthorDate: Mon, 19 Oct 2015 11:17:46 +0200 Committer: Ingo Molnar CommitDate: Wed, 21 Oct 2015 11:10:56 +0200 x86/setup/crash: Check memblock_reserve() retval memblock_reserve() can fail but the crashkernel reservation code doesn't check that and this can lead the user into believing that the crashkernel region was actually reserved. Make sure we check that return value and we exit early with a failure message in the error case. Signed-off-by: Borislav Petkov Reviewed-by: Dave Young Reviewed-by: Joerg Roedel Cc: Andrew Morton Cc: Andy Lutomirski Cc: H. Peter Anvin Cc: Jiri Kosina Cc: Juergen Gross Cc: Linus Torvalds Cc: Mark Salter Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: WANG Chao Cc: jerry_hoemann@hp.com Link: http://lkml.kernel.org/r/1445246268-26285-7-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/setup.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index d478871..3f75297 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -531,7 +531,11 @@ static int __init reserve_crashkernel_low(void) return -ENOMEM; } - memblock_reserve(low_base, low_size); + ret = memblock_reserve(low_base, low_size); + if (ret) { + pr_err("%s: Error reserving crashkernel low memblock.\n", __func__); + return ret; + } pr_info("Reserving %ldMB of low memory at %ldMB for crashkernel (System low RAM: %ldMB)\n", (unsigned long)(low_size >> 20), @@ -589,7 +593,11 @@ static void __init reserve_crashkernel(void) return; } } - memblock_reserve(crash_base, crash_size); + ret = memblock_reserve(crash_base, crash_size); + if (ret) { + pr_err("%s: Error reserving crashkernel memblock.\n", __func__); + return; + } if (crash_base >= (1ULL << 32) && reserve_crashkernel_low()) { memblock_free(crash_base, crash_size);