From patchwork Mon Jun 6 17:00:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King X-Patchwork-Id: 9158835 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 25D4860759 for ; Mon, 6 Jun 2016 17:02:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16E7C2833E for ; Mon, 6 Jun 2016 17:02:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BC882834D; Mon, 6 Jun 2016 17:02:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C3DA72833E for ; Mon, 6 Jun 2016 17:02:55 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b9xta-0003kg-1n; Mon, 06 Jun 2016 17:00:58 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b9xtQ-00037D-7p for linux-arm-kernel@lists.infradead.org; Mon, 06 Jun 2016 17:00:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References:In-Reply-To; bh=cMwgVc2C3hHDAPfeAA55BDLh5x9r/ohN4bPAlhllvjw=; b=gPqYVZEpLmpEA7qSCuMCvLobTVWt+67T6fNCi9qMjFPPwtDQjRvuf2NHz6aKhyajPEyAm+m1nruz4xBV0e9K+dwWSvx2Xti4byJJjnIXWKZhZpwtdim76U+UMyRT1peJvJyvSlmm9+COypOkDuNXEpQecviKxBOk9FYm9g3Exs0=; Received: from [fd8f:7570:feb6:1:b4eb:e902:622d:f2f0] (port=37664 helo=e0050434b2927.dyn.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLSv1:DHE-RSA-AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1b9xsw-0000IB-Nc; Mon, 06 Jun 2016 18:00:18 +0100 Received: from rmk by e0050434b2927.dyn.armlinux.org.uk with local (Exim 4.82) (envelope-from ) id 1b9xsu-0003tA-3i; Mon, 06 Jun 2016 18:00:16 +0100 In-Reply-To: <20160606164129.GM1041@n2100.armlinux.org.uk> References: <20160606164129.GM1041@n2100.armlinux.org.uk> From: Russell King To: kexec@lists.infradead.org,linux-arm-kernel@lists.infradead.org Subject: [PATCH kexec-tools v2 18/32] arm: report if crash kernel is out of bounds MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 06 Jun 2016 18:00:16 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160606_100049_164005_CCC8EEBB X-CRM114-Status: GOOD ( 12.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pratyush Anand , Baoquan He Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Report an error if the crash kernel memory region is outside of the boot-view memory range - this can happen with systems such as Keystone 2. Signed-off-by: Russell King Reviewed-by: Pratyush Anand --- kexec/arch/arm/crashdump-arm.c | 11 +++++++++++ kexec/arch/arm/crashdump-arm.h | 1 + 2 files changed, 12 insertions(+) diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c index fcc4d42..739c906 100644 --- a/kexec/arch/arm/crashdump-arm.c +++ b/kexec/arch/arm/crashdump-arm.c @@ -365,6 +365,17 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) if (get_kernel_page_offset(info, &elf_info)) return -1; + /* + * Ensure that the crash kernel memory range is sane. The crash kernel + * must be located within memory which is visible during booting. + */ + if (crash_reserved_mem.end > ARM_MAX_VIRTUAL) { + fprintf(stderr, + "Crash kernel memory [0x%llx-0x%llx] is inaccessible at boot - unable to load crash kernel\n", + crash_reserved_mem.start, crash_reserved_mem.end); + return -1; + } + last_ranges = usablemem_rgns.size - 1; if (last_ranges < 0) last_ranges = 0; diff --git a/kexec/arch/arm/crashdump-arm.h b/kexec/arch/arm/crashdump-arm.h index 2dbde04..7314960 100644 --- a/kexec/arch/arm/crashdump-arm.h +++ b/kexec/arch/arm/crashdump-arm.h @@ -9,6 +9,7 @@ extern "C" { #define DEFAULT_PAGE_OFFSET (0xc0000000) #define KVBASE_MASK (0x1ffffff) #define CRASH_MAX_MEMORY_RANGES 32 +#define ARM_MAX_VIRTUAL UINT32_MAX extern struct memory_ranges usablemem_rgns;