From: tip-bot2 for John Hubbard <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
John Hubbard <jhubbard@nvidia.com>,
Thomas Gleixner <tglx@linutronix.de>,
Neil MacLeod <neil@nmacleod.com>
Subject: [tip: x86/urgent] x86/boot: Fix boot regression caused by bootparam sanitizing
Date: Fri, 23 Aug 2019 01:10:47 -0000 [thread overview]
Message-ID: <156652264750.9533.3737031935739279123.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20190821192513.20126-1-jhubbard@nvidia.com>
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 7846f58fba964af7cb8cf77d4d13c33254725211
Gitweb: https://git.kernel.org/tip/7846f58fba964af7cb8cf77d4d13c33254725211
Author: John Hubbard <jhubbard@nvidia.com>
AuthorDate: Wed, 21 Aug 2019 12:25:13 -07:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Wed, 21 Aug 2019 22:37:09 +02:00
x86/boot: Fix boot regression caused by bootparam sanitizing
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@nmacleod.com>
Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Neil MacLeod <neil@nmacleod.com>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20190821192513.20126-1-jhubbard@nvidia.com
---
arch/x86/include/asm/bootparam_utils.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/bootparam_utils.h b/arch/x86/include/asm/bootparam_utils.h
index 9e5f3c7..f5e90a8 100644
--- a/arch/x86/include/asm/bootparam_utils.h
+++ b/arch/x86/include/asm/bootparam_utils.h
@@ -59,6 +59,7 @@ static void sanitize_boot_params(struct boot_params *boot_params)
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),
@@ -70,7 +71,6 @@ static void sanitize_boot_params(struct boot_params *boot_params)
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),
};
prev parent reply other threads:[~2019-08-23 1:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAFbqK8m=F_90531wTiwKT4J0R+EC-3ZmqHtKCwA_2th_nVYrpg@mail.gmail.com>
2019-08-21 18:18 ` Boot failure due to: x86/boot: Save fields explicitly, zero out everything else John Hubbard
2019-08-21 18:32 ` Neil MacLeod
2019-08-21 18:49 ` John Hubbard
2019-08-21 18:51 ` Thomas Gleixner
2019-08-21 18:54 ` John Hubbard
2019-08-21 19:49 ` Neil MacLeod
2019-08-21 20:00 ` John Hubbard
2019-08-21 18:56 ` Neil MacLeod
2019-08-21 19:25 ` [PATCH] x86/boot: Fix boot failure regression John Hubbard
2019-08-21 19:46 ` Neil MacLeod
2019-08-21 21:24 ` Thomas Gleixner
2019-08-22 12:30 ` Greg KH
2019-08-23 1:10 ` tip-bot2 for John Hubbard [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=156652264750.9533.3737031935739279123.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=jhubbard@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=neil@nmacleod.com \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).