From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753627AbcHQBvN (ORCPT ); Tue, 16 Aug 2016 21:51:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53890 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753566AbcHQBvL (ORCPT ); Tue, 16 Aug 2016 21:51:11 -0400 From: Xunlei Pang To: linux-kernel@vger.kernel.org, kexec@lists.infradead.org Cc: akpm@linux-foundation.org, ebiederm@xmission.com, Vivek Goyal , Dave Young , Baoquan He , Xunlei Pang Subject: [PATCH v2 2/2] kexec: Consider crashk_low_res in sanity_check_segment_list() Date: Wed, 17 Aug 2016 09:50:57 +0800 Message-Id: <1471398657-20237-2-git-send-email-xlpang@redhat.com> In-Reply-To: <1471398657-20237-1-git-send-email-xlpang@redhat.com> References: <1471398657-20237-1-git-send-email-xlpang@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 17 Aug 2016 01:51:10 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We have crashk_res only in most cases, but sometimes we have crashk_low_res. For example, on 64-bit x86 systems, when "crashkernel=32M,high" combined with "crashkernel=128M,low" is used, so some segments may have the chance to be loaded into crashk_low_res area. We can't fail it as a memory violation in these cases. Thus, we add the case to regard the segment as valid if it is within crashk_low_res. Signed-off-by: Xunlei Pang --- kernel/kexec_core.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index 707d18e..9012a60 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -248,9 +248,14 @@ int sanity_check_segment_list(struct kimage *image) mstart = image->segment[i].mem; mend = mstart + image->segment[i].memsz - 1; /* Ensure we are within the crash kernel limits */ - if ((mstart < phys_to_boot_phys(crashk_res.start)) || - (mend > phys_to_boot_phys(crashk_res.end))) - return -EADDRNOTAVAIL; + if ((mstart >= phys_to_boot_phys(crashk_res.start)) && + (mend <= phys_to_boot_phys(crashk_res.end))) + continue; + if ((mstart >= phys_to_boot_phys(crashk_low_res.start)) && + (mend <= phys_to_boot_phys(crashk_low_res.end))) + continue; + + return -EADDRNOTAVAIL; } } -- 1.8.3.1