Commit 2e604c0f authored by Josh Boyer's avatar Josh Boyer Committed by H. Peter Anvin

x86: Don't clear efi_info even if the sentinel hits

When boot_params->sentinel is set, all we really know is that some
undefined set of fields in struct boot_params contain garbage.  In the
particular case of efi_info, however, there is a private magic for
that substructure, so it is generally safe to leave it even if the
bootloader is broken.

kexec (for which we did the initial analysis) did not initialize this
field, but of course all the EFI bootloaders do, and most EFI
bootloaders are broken in this respect (and should be fixed.)
Reported-by: default avatarRobin Holt <holt@sgi.com>
Link: http://lkml.kernel.org/r/CA%2B5PVA51-FT14p4CRYKbicykugVb=PiaEycdQ57CK2km_OQuRQ@mail.gmail.comTested-by: default avatarJosh Boyer <jwboyer@gmail.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 98e7a989
...@@ -14,13 +14,15 @@ ...@@ -14,13 +14,15 @@
* analysis of kexec-tools; if other broken bootloaders initialize a * analysis of kexec-tools; if other broken bootloaders initialize a
* different set of fields we will need to figure out how to disambiguate. * different set of fields we will need to figure out how to disambiguate.
* *
* Note: efi_info is commonly left uninitialized, but that field has a
* private magic, so it is better to leave it unchanged.
*/ */
static void sanitize_boot_params(struct boot_params *boot_params) static void sanitize_boot_params(struct boot_params *boot_params)
{ {
if (boot_params->sentinel) { if (boot_params->sentinel) {
/*fields in boot_params are not valid, clear them */ /*fields in boot_params are not valid, clear them */
memset(&boot_params->olpc_ofw_header, 0, memset(&boot_params->olpc_ofw_header, 0,
(char *)&boot_params->alt_mem_k - (char *)&boot_params->efi_info -
(char *)&boot_params->olpc_ofw_header); (char *)&boot_params->olpc_ofw_header);
memset(&boot_params->kbd_status, 0, memset(&boot_params->kbd_status, 0,
(char *)&boot_params->hdr - (char *)&boot_params->hdr -
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment