x86/boot: clear rsdp address in boot_params for broken loaders
PATCH 1/1 x86/boot: clear rsdp address in boot_params for broken loaders
In case a broken boot loader doesn't clear its struct boot_params clear rsdp_addr in sanitize_boot_params().
This fixes commit e6e094e053af75 ("x86/acpi, x86/boot: Take RSDP address from boot params if available") e.g. for the case of a boot via systemd-boot.
--- arch/x86/include/asm/bootparam_utils.h | 1 + 1 file changed, 1 insertion(+)
arch/x86/include/asm/bootparam_utils.h +1 -0
@@ -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);
Signature · 1 line
2.16.4
tip-bot for Juergen Gross
merge bot[tip:x86/urgent] x86/boot: Clear RSDP address in boot_params for broken loaders
x86/boot: Clear RSDP address in boot_params for broken loaders
Commit-ID: 182ddd16194cd082f25fa1b063dae3c7c5cce384 Gitweb: https://git.kernel.org/tip/182ddd16194cd082f25fa1b063dae3c7c5cce384 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 3 Dec 2018 11:38:11 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 3 Dec 2018 11:56:37 +0100
x86/boot: Clear RSDP address in boot_params for broken loaders
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().
--- arch/x86/include/asm/bootparam_utils.h | 1 + 1 file changed, 1 insertion(+)
arch/x86/include/asm/bootparam_utils.h +1 -0
@@ -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);
[email protected]
reviewerQuoted 29 lines · Juergen Gross
In case a broken boot loader doesn't clear its struct
boot_paramsclearrsdp_addrinsanitize_boot_params().This fixes commit
e6e094e053af75("x86/acpi, x86/boot: Take RSDP address from boot params if available") e.g. for the case of a boot via systemd-boot.Fixes e6e094e053af75 ("x86/acpi, x86/boot: Take RSDP address from bootparams if available")
Reported-by Gunnar Krueger <[email protected]>Tested-by Gunnar Krueger <[email protected]>Signed-off-by Juergen Gross <[email protected]>---
arch/x86/include/asm/bootparam_utils.h| 1 +1 file changed, 1 insertion(+)arch/x86/include/asm/bootparam_utils.h +1
-0@@ -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 -
Quoted 1 line
(char *)&boot_params->ext_ramdisk_image);
Isn't this already covered by the memset()? If not, we should extend the memset() to maximal coverage.
Signature · 1 line
Sent from my Android device with K-9 Mail. Please excuse my brevity.
Quoted 17 lines · On 04/12/2018 00:07, [email protected] wrote:
Quoted 16 lines · Juergen Gross
In case a broken boot loader doesn't clear its struct
boot_paramsclearrsdp_addrinsanitize_boot_params().This fixes commit
e6e094e053af75("x86/acpi, x86/boot: Take RSDP address from boot params if available") e.g. for the case of a boot via systemd-boot.Fixes e6e094e053af75 ("x86/acpi, x86/boot: Take RSDP address from bootparams if available")
Reported-by Gunnar Krueger <[email protected]>Tested-by Gunnar Krueger <[email protected]>Signed-off-by Juergen Gross <[email protected]>---
arch/x86/include/asm/bootparam_utils.h| 1 +1 file changed, 1 insertion(+)
Quoted 16 lines
Quoted 13 lines
arch/x86/include/asm/bootparam_utils.h +1
-0@@ -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 -Quoted 1 line
(char *)&boot_params->ext_ramdisk_image);Isn't this already covered by the
memset()? If not, we should extend thememset()to maximal coverage.
I'd like to send a followup patch doing that. And I'd like to not only test sentinel for being non-zero, but all padding fields as well. This should be 4.21 material, though.
Juergen
H. Peter Anvin
reviewerQuoted 5 lines · Juergen Gross
I'd like to send a followup patch doing that. And I'd like to not only test sentinel for being non-zero, but all padding fields as well. This should be 4.21 material, though.
No, you can't do that. That breaks backwards compatibility.
-hpa
Quoted 8 lines · H. Peter Anvin
Quoted 5 lines · Juergen Gross
I'd like to send a followup patch doing that. And I'd like to not only test sentinel for being non-zero, but all padding fields as well. This should be 4.21 material, though.
No, you can't do that. That breaks backwards compatibility.
So you are speaking about paddings which are at places where there used to be some information? Shouldn't those be named "_res*"? Recycling such paddings with some useful information seems to be rather dangerous then.
I'd like to have at least some idea which boot loader is not passing a clean struct boot_params. So I think we should at least have some debug or info messages telling us which paddings are not zero initially to be able to either fix the boot loader or switch from _pad* to _res* naming.
Juergen