Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp2096144imm; Thu, 27 Sep 2018 07:22:37 -0700 (PDT) X-Google-Smtp-Source: ACcGV61Gr0ljRgaJaFxK9avW0X4VgSG0K4Vi1Vz3e2CM0/UNvwbhHLdGQjngD48bbu0oCIKep266 X-Received: by 2002:a62:6948:: with SMTP id e69-v6mr11731840pfc.166.1538058157161; Thu, 27 Sep 2018 07:22:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538058157; cv=none; d=google.com; s=arc-20160816; b=TyQXFvaZ1bLSrsBPxIF16FCHE2cSksChmJFyhUNtNXrLnGL9ZNbu7SQuIXHKSKrcvg 6I3krJRXZXYsCfkhYqQjp0sIRi1EOXYdWSdwVTbt+nVc2OqPxmzuMzXw5p6j6NMvsy7l XpX+F0lvrelqDBxprg9YUiv9Do96ui8uj5YOE5tkd6+c8CRnVt396+TAZpjP+l7PscwT nV8BT6USNMEOKZr0piokQhssWDbH2W9hHmhyNmpbpTmBkNzRVhmr1DQbJi+WlJ389QRz VY6rbLzOkmmHk4DbS8/dgXDbHJiP5GfsRtqJAvB7k472ERDL3/640lIYt1V6C9CpIgow vk0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject:dkim-signature; bh=fh4ZAhxA8cQusxeZ15BrK1iRzu1+hYZhKDs41a6DLT8=; b=DU0i5GsKoQqMH5grz6oJwXuefeZ0qyHhZ9r65kE+JjSdQP930TAzo5WNFLC2vn0TR6 8u9596s/WTXElg1L5SFSaeT50b88M1kkS6DQ7GqRbH9YHimrWX/wl1bIeBzjbJxtJbtg tMPh8gvCZsj9dGMSE6MmINhs4wHIZJEwFm0LS+bVs1EKFGmfViH596qQG8bjljmtxRWz ERWJyUoBGiureUMpm5TLcCdspMdF14BjzWAkrc5sCLKHAVIvUDbMjGvFEPpQxr2vOH07 dJvg1Hi4t3kGMyKQxxOoMULO3Rs9lv2vDUjIRJw8Rpm32cbByBkVS9Y4YrnfJ7gxjnY0 S/bA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=04P+cFTB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q4-v6si2157549pfh.34.2018.09.27.07.22.21; Thu, 27 Sep 2018 07:22:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=04P+cFTB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727867AbeI0Uk1 (ORCPT + 99 others); Thu, 27 Sep 2018 16:40:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:41342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727404AbeI0Uk1 (ORCPT ); Thu, 27 Sep 2018 16:40:27 -0400 Received: from localhost (173-25-171-118.client.mchsi.com [173.25.171.118]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 08E3A216FC; Thu, 27 Sep 2018 14:21:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1538058117; bh=owsN081jrijkcbcI16hU/Vz2MaPJONXQwVeDteQpONc=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=04P+cFTBi8FyVyj6gAlY88K1IgvOekJv62zakqQXpTUCSCRPVLT9Exg5NqyoGEnDa qxNwJoYdEZDzXsd/Wt4R2xK55XaDlh4KVqXassNnCLCrl4wru7SFvVc50HWYEFUfxG Df6sRxz6J84T04896yt23970FPehjlznSBaQ0KUg= Subject: [PATCH 1/3] x86/kexec: Correct KEXEC_BACKUP_SRC_END off-by-one error From: Bjorn Helgaas To: linux-kernel@vger.kernel.org Cc: Lianbo Jiang , Vivek Goyal , kexec@lists.infradead.org, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, akpm@linux-foundation.org, dan.j.williams@intel.com, thomas.lendacky@amd.com, baiyaowei@cmss.chinamobile.com, tiwai@suse.de, bp@suse.de, brijesh.singh@amd.com, dyoung@redhat.com, bhe@redhat.com Date: Thu, 27 Sep 2018 09:21:55 -0500 Message-ID: <153805811578.1157.6948388946904655969.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <153805773703.1157.14773321497580233478.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <153805773703.1157.14773321497580233478.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.18 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bjorn Helgaas The only use of KEXEC_BACKUP_SRC_END is as an argument to walk_system_ram_res(): int crash_load_segments(struct kimage *image) { ... walk_system_ram_res(KEXEC_BACKUP_SRC_START, KEXEC_BACKUP_SRC_END, image, determine_backup_region); walk_system_ram_res() expects "start, end" arguments that are inclusive, i.e., the range to be walked includes both the start and end addresses. KEXEC_BACKUP_SRC_END was previously defined as (640 * 1024UL), which is the first address *past* the desired 0-640KB range. Define KEXEC_BACKUP_SRC_END as (640 * 1024UL - 1) so the KEXEC_BACKUP_SRC region is [0-0x9ffff], not [0-0xa0000]. Fixes: dd5f726076cc ("kexec: support for kexec on panic using new system call") Signed-off-by: Bjorn Helgaas --- arch/x86/include/asm/kexec.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h index f327236f0fa7..5125fca472bb 100644 --- a/arch/x86/include/asm/kexec.h +++ b/arch/x86/include/asm/kexec.h @@ -67,7 +67,7 @@ struct kimage; /* Memory to backup during crash kdump */ #define KEXEC_BACKUP_SRC_START (0UL) -#define KEXEC_BACKUP_SRC_END (640 * 1024UL) /* 640K */ +#define KEXEC_BACKUP_SRC_END (640 * 1024UL - 1) /* 640K */ /* * CPU does not save ss and sp on stack if execution is already