44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
|
From: Juergen Gross <jgross@suse.com>
|
||
|
|
Date: Mon, 3 Dec 2018 11:38:11 +0100
|
||
|
|
Subject: x86/boot: Clear RSDP address in boot_params for broken loaders
|
||
|
|
Origin: https://git.kernel.org/linus/182ddd16194cd082f25fa1b063dae3c7c5cce384
|
||
|
|
|
||
|
|
Gunnar Krueger reported a systemd-boot failure and bisected it down to:
|
||
|
|
|
||
|
|
e6e094e053af75 ("x86/acpi, x86/boot: Take RSDP address from boot params if available")
|
||
|
|
|
||
|
|
In case a broken boot loader doesn't clear its 'struct boot_params', clear
|
||
|
|
rsdp_addr in sanitize_boot_params().
|
||
|
|
|
||
|
|
Reported-by: Gunnar Krueger <taijian@posteo.de>
|
||
|
|
Tested-by: Gunnar Krueger <taijian@posteo.de>
|
||
|
|
Signed-off-by: Juergen Gross <jgross@suse.com>
|
||
|
|
Cc: H. Peter Anvin <hpa@zytor.com>
|
||
|
|
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
||
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
||
|
|
Cc: Thomas Gleixner <tglx@linutronix.de>
|
||
|
|
Cc: bp@alien8.de
|
||
|
|
Cc: sstabellini@kernel.org
|
||
|
|
Fixes: e6e094e053af75 ("x86/acpi, x86/boot: Take RSDP address from boot params if available")
|
||
|
|
Link: http://lkml.kernel.org/r/20181203103811.17056-1-jgross@suse.com
|
||
|
|
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
||
|
|
---
|
||
|
|
arch/x86/include/asm/bootparam_utils.h | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/arch/x86/include/asm/bootparam_utils.h b/arch/x86/include/asm/bootparam_utils.h
|
||
|
|
index a07ffd23e4dd..f6f6ef436599 100644
|
||
|
|
--- a/arch/x86/include/asm/bootparam_utils.h
|
||
|
|
+++ b/arch/x86/include/asm/bootparam_utils.h
|
||
|
|
@@ -36,6 +36,7 @@ static void sanitize_boot_params(struct boot_params *boot_params)
|
||
|
|
*/
|
||
|
|
if (boot_params->sentinel) {
|
||
|
|
/* fields in boot_params are left uninitialized, clear them */
|
||
|
|
+ boot_params->acpi_rsdp_addr = 0;
|
||
|
|
memset(&boot_params->ext_ramdisk_image, 0,
|
||
|
|
(char *)&boot_params->efi_info -
|
||
|
|
(char *)&boot_params->ext_ramdisk_image);
|
||
|
|
--
|
||
|
|
2.19.2
|
||
|
|
|