[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190904175307.095286436@linuxfoundation.org>
Date: Wed, 4 Sep 2019 19:53:28 +0200
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, Neil MacLeod <neil@...cleod.com>,
Thomas Gleixner <tglx@...utronix.de>,
John Hubbard <jhubbard@...dia.com>
Subject: [PATCH 4.9 36/83] x86/boot: Fix boot regression caused by bootparam sanitizing
From: John Hubbard <jhubbard@...dia.com>
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 <neil@...cleod.com>
Suggested-by: Thomas Gleixner <tglx@...utronix.de>
Signed-off-by: John Hubbard <jhubbard@...dia.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Tested-by: Neil MacLeod <neil@...cleod.com>
Cc: stable@...r.kernel.org
Link: https://lkml.kernel.org/r/20190821192513.20126-1-jhubbard@nvidia.com
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
arch/x86/include/asm/bootparam_utils.h | 1 +
1 file changed, 1 insertion(+)
--- a/arch/x86/include/asm/bootparam_utils.h
+++ b/arch/x86/include/asm/bootparam_utils.h
@@ -70,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(eddbuf),
};
Powered by blists - more mailing lists