Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86, doc: Be explicit about what the x86 struct boot_params requires

If the sentinel triggers, we do not want the boot loader authors to
just poke it and make the error go away, we want them to actually fix
the problem.

This should help avoid making the incorrect change in non-compliant
bootloaders.

[ hpa: dropped the Documentation/x86/boot.txt hunk pending
clarifications ]

Signed-off-by: Peter Jones <pjones@redhat.com>
Link: http://lkml.kernel.org/r/1362592823-28967-1-git-send-email-pjones@redhat.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

authored by

Peter Jones and committed by
H. Peter Anvin
3c4aff6b 2e604c0f

+15 -1
+15 -1
arch/x86/include/asm/bootparam_utils.h
··· 19 19 */ 20 20 static void sanitize_boot_params(struct boot_params *boot_params) 21 21 { 22 + /* 23 + * IMPORTANT NOTE TO BOOTLOADER AUTHORS: do not simply clear 24 + * this field. The purpose of this field is to guarantee 25 + * compliance with the x86 boot spec located in 26 + * Documentation/x86/boot.txt . That spec says that the 27 + * *whole* structure should be cleared, after which only the 28 + * portion defined by struct setup_header (boot_params->hdr) 29 + * should be copied in. 30 + * 31 + * If you're having an issue because the sentinel is set, you 32 + * need to change the whole structure to be cleared, not this 33 + * (or any other) individual field, or you will soon have 34 + * problems again. 35 + */ 22 36 if (boot_params->sentinel) { 23 - /*fields in boot_params are not valid, clear them */ 37 + /* fields in boot_params are left uninitialized, clear them */ 24 38 memset(&boot_params->olpc_ofw_header, 0, 25 39 (char *)&boot_params->efi_info - 26 40 (char *)&boot_params->olpc_ofw_header);