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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 4CED4C43381 for ; Tue, 12 Mar 2019 18:06:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0454B205C9 for ; Tue, 12 Mar 2019 18:06:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552413972; bh=WaXhZID7zqorTXCVhKrByuotpQq0qwqKQSFerB0sCoU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ikSuS0/9+BobU3bNw1f291tcoWpvgorgjLzFwNyUkTO4ikX6dLlOp+BvX0K/wr7Ny JSE7ZRvRaYDBy4xcC0C9tpy7iAwOTOe7LSn6/Grwk5NYeEjLljeUbuLXCTBVj1zSN4 MNEDbd07TvO/pB5dByeb5bLZiB7rSisk5QsM9HEI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729193AbfCLSGK (ORCPT ); Tue, 12 Mar 2019 14:06:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:47884 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727491AbfCLRMc (ORCPT ); Tue, 12 Mar 2019 13:12:32 -0400 Received: from localhost (unknown [104.133.8.98]) (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 A26222171F; Tue, 12 Mar 2019 17:12:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552410751; bh=WaXhZID7zqorTXCVhKrByuotpQq0qwqKQSFerB0sCoU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oq5Xf577uVe3ECT9yi6b+Ev7Fur50m0ZsUrlD2TPXPW7il2LQWYE7DzWTJSuTDwCm bJHrDq1Wk0MyhP5geoS5gGqi1zyOKItdbVnkVmp4hhGaXrwsIQ9a3zzGkmqWCRxS2v TCSc2pveIY0KOCH13v4d9sNlOW8ud8IAVKaLpNYU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Young , 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 4.20 060/171] x86/kexec: Dont setup EFI info if EFI runtime is not enabled Date: Tue, 12 Mar 2019 10:07:20 -0700 Message-Id: <20190312170353.342700242@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190312170347.868927101@linuxfoundation.org> References: <20190312170347.868927101@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 278cd07228dd..9490a2845f14 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