From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F138C43381 for ; Sat, 23 Feb 2019 21:08:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 570832086A for ; Sat, 23 Feb 2019 21:08:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550956103; bh=Vyf0U4F5Cx2ttXumX0HULxU5J2ptDo77h9wQXhgIrNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=r8ROOzTIXP13IMeIJhHcp27XNKKNkmzS8CLF4KBsSZbizsuP1gn0BzT/C9HYD7ltl zfYmZ33fSp/m9q4Hvtl2sLSAR1VjV8j2YJkCgJvbh+ZWlYHQqYW4tWb87ho6Ue32Ed Qwefz5781l2ajf1IPjQW4hQG3tPMEZoxcZcLGE+c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728670AbfBWVIV (ORCPT ); Sat, 23 Feb 2019 16:08:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:43550 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729245AbfBWVIO (ORCPT ); Sat, 23 Feb 2019 16:08:14 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9A00C2086D; Sat, 23 Feb 2019 21:08:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550956093; bh=Vyf0U4F5Cx2ttXumX0HULxU5J2ptDo77h9wQXhgIrNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O7X2olMGJxZn6zTdLRg+zx6ERNObwk432HqsGJcZKHd0XSzJ+5gIQabBtU40L0GwX R8Zms67aQilNccQR5WxR5ZN0rMIE59hdgpCu0w6s4wtmpw6klEPBEgYaiy0vb6oq2i 5rng6tE7COs5ozvlI4BxgLj5C50akXrNMLa/Mz5k= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kairui Song , Borislav Petkov , AKASHI Takahiro , Andrew Morton , Ard Biesheuvel , bhe@redhat.com, David Howells , erik.schmauss@intel.com, fanc.fnst@cn.fujitsu.com, "H. Peter Anvin" , Ingo Molnar , kexec@lists.infradead.org, lenb@kernel.org, linux-acpi@vger.kernel.org, Philipp Rudo , rafael.j.wysocki@intel.com, robert.moore@intel.com, Thomas Gleixner , x86-ml , Yannik Sembritzki , Sasha Levin Subject: [PATCH AUTOSEL 4.19 57/65] x86/kexec: Don't setup EFI info if EFI runtime is not enabled Date: Sat, 23 Feb 2019 16:06:32 -0500 Message-Id: <20190223210640.200911-57-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190223210640.200911-1-sashal@kernel.org> References: <20190223210640.200911-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kairui Song [ Upstream commit 2aa958c99c7fd3162b089a1a56a34a0cdb778de1 ] Kexec-ing a kernel with "efi=noruntime" on the first kernel's command line causes the following null pointer dereference: BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 #PF error: [normal kernel read fault] Call Trace: efi_runtime_map_copy+0x28/0x30 bzImage64_load+0x688/0x872 arch_kexec_kernel_image_load+0x6d/0x70 kimage_file_alloc_init+0x13e/0x220 __x64_sys_kexec_file_load+0x144/0x290 do_syscall_64+0x55/0x1a0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Just skip the EFI info setup if EFI runtime services are not enabled. [ bp: Massage commit message. ] Suggested-by: Dave Young Signed-off-by: Kairui Song Signed-off-by: Borislav Petkov Acked-by: Dave Young Cc: AKASHI Takahiro Cc: Andrew Morton Cc: Ard Biesheuvel Cc: bhe@redhat.com Cc: David Howells Cc: erik.schmauss@intel.com Cc: fanc.fnst@cn.fujitsu.com Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: kexec@lists.infradead.org Cc: lenb@kernel.org Cc: linux-acpi@vger.kernel.org Cc: Philipp Rudo Cc: rafael.j.wysocki@intel.com Cc: robert.moore@intel.com Cc: Thomas Gleixner Cc: x86-ml Cc: Yannik Sembritzki Link: https://lkml.kernel.org/r/20190118111310.29589-2-kasong@redhat.com Signed-off-by: Sasha Levin --- arch/x86/kernel/kexec-bzimage64.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c index 278cd07228dd8..9490a2845f14b 100644 --- a/arch/x86/kernel/kexec-bzimage64.c +++ b/arch/x86/kernel/kexec-bzimage64.c @@ -167,6 +167,9 @@ setup_efi_state(struct boot_params *params, unsigned long params_load_addr, struct efi_info *current_ei = &boot_params.efi_info; struct efi_info *ei = ¶ms->efi_info; + if (!efi_enabled(EFI_RUNTIME_SERVICES)) + return 0; + if (!current_ei->efi_memmap_size) return 0; -- 2.19.1