Merge tag 'efi-urgent-for-v6.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi

torvalds · torvalds · commit 94a502eb5977 · 2024-01-03T11:50:17.000-08:00
Pull EFI fix from Ard Biesheuvel:

 - Ensure that the KASLR load flag is set in boot_params when loading
   the kernel randomized directly from the EFI stub

* tag 'efi-urgent-for-v6.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efi/x86: Fix the missing KASLR_FLAG bit in boot_params-&gt;hdr.loadflags
diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
@@ -787,6 +787,8 @@ static efi_status_t efi_decompress_kernel(unsigned long *kernel_entry)
 			efi_debug("AMI firmware v2.0 or older detected - disabling physical KASLR\n");
 			seed[0] = 0;
 		}
+
+		boot_params_ptr->hdr.loadflags |= KASLR_FLAG;
 	}
 
 	status = efi_random_alloc(alloc_size, CONFIG_PHYSICAL_ALIGN, &addr,

Original file line number	Diff line number	Diff line change
`@@ -787,6 +787,8 @@ static efi_status_t efi_decompress_kernel(unsigned long *kernel_entry)`
`787`	`787`	`efi_debug("AMI firmware v2.0 or older detected - disabling physical KASLR\n");`
`788`	`788`	`seed[0] = 0;`
`789`	`789`	`}`
	`790`	`+`
	`791`	`+ boot_params_ptr->hdr.loadflags \|= KASLR_FLAG;`
`790`	`792`	`}`
`791`	`793`
`792`	`794`	`status = efi_random_alloc(alloc_size, CONFIG_PHYSICAL_ALIGN, &addr,`