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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 3D9B9C3A5A6 for ; Tue, 27 Aug 2019 08:05:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 061072173E for ; Tue, 27 Aug 2019 08:05:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566893131; bh=ebZgYB6R0/vyzOKHPC4jX6y5EBXSalTY8oBL7udNUd4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UahNT4AwqkYpdD1hZu7AenICn9LsTIeS76B7yPGApZH+qY3LPaj9Ri9WFBlKR1i0Y rXQYnFvFTxHwYwt7eqj4DnbKjjOgU+JqEl45shlS9Q5y+lPMUq+Aa6kE+EAoC/UYT+ 6x5iGpLVJb6BaZ1MMmBMyyUR/z5/u3+Ta15R5sWg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732807AbfH0IFa (ORCPT ); Tue, 27 Aug 2019 04:05:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:35226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732786AbfH0IF0 (ORCPT ); Tue, 27 Aug 2019 04:05:26 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 C22F822CED; Tue, 27 Aug 2019 08:05:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566893125; bh=ebZgYB6R0/vyzOKHPC4jX6y5EBXSalTY8oBL7udNUd4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0c9Uh15dDZhMw6neI9kL+P2y/kSa5UxcgSpZvqKVMnZ/L55buw1VH0KwPCFSRawOc ULKzs4KshSYPiINMJeEdNPOVaqAqjo0UD3deiSGbC6LXaLno/Uyb1F/ToqMVhMmeSP xZ/y4A3o4qfuRIduv53QJTJuzc7JrcSP9qx0HUl0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Neil MacLeod , Thomas Gleixner , John Hubbard Subject: [PATCH 5.2 129/162] x86/boot: Fix boot regression caused by bootparam sanitizing Date: Tue, 27 Aug 2019 09:50:57 +0200 Message-Id: <20190827072743.013028143@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190827072738.093683223@linuxfoundation.org> References: <20190827072738.093683223@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: John Hubbard commit 7846f58fba964af7cb8cf77d4d13c33254725211 upstream. commit a90118c445cc ("x86/boot: Save fields explicitly, zero out everything else") had two errors: * It preserved boot_params.acpi_rsdp_addr, and * It failed to preserve boot_params.hdr Therefore, zero out acpi_rsdp_addr, and preserve hdr. Fixes: a90118c445cc ("x86/boot: Save fields explicitly, zero out everything else") Reported-by: Neil MacLeod Suggested-by: Thomas Gleixner Signed-off-by: John Hubbard Signed-off-by: Thomas Gleixner Tested-by: Neil MacLeod Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20190821192513.20126-1-jhubbard@nvidia.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/include/asm/bootparam_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/include/asm/bootparam_utils.h +++ b/arch/x86/include/asm/bootparam_utils.h @@ -59,7 +59,6 @@ static void sanitize_boot_params(struct BOOT_PARAM_PRESERVE(apm_bios_info), BOOT_PARAM_PRESERVE(tboot_addr), BOOT_PARAM_PRESERVE(ist_info), - BOOT_PARAM_PRESERVE(acpi_rsdp_addr), BOOT_PARAM_PRESERVE(hd0_info), BOOT_PARAM_PRESERVE(hd1_info), BOOT_PARAM_PRESERVE(sys_desc_table), @@ -71,6 +70,7 @@ static void sanitize_boot_params(struct BOOT_PARAM_PRESERVE(eddbuf_entries), BOOT_PARAM_PRESERVE(edd_mbr_sig_buf_entries), BOOT_PARAM_PRESERVE(edd_mbr_sig_buffer), + BOOT_PARAM_PRESERVE(hdr), BOOT_PARAM_PRESERVE(e820_table), BOOT_PARAM_PRESERVE(eddbuf), };