diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-03 11:50:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-03 11:50:17 -0800 |
| commit | 94a502eb59775e13c9089de38c601f9f85b25750 (patch) | |
| tree | 09b900544ba0ba9afab9329e209fb7fe46a343e6 | |
| parent | 360f0342b2e9374298e2222c846f3fe9d0295f0d (diff) | |
| parent | 01638431c465741e071ab34acf3bef3c2570f878 (diff) | |
| download | misc-94a502eb59775e13c9089de38c601f9f85b25750.tar.gz | |
Merge tag 'efi-urgent-for-v6.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
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->hdr.loadflags
| -rw-r--r-- | drivers/firmware/efi/libstub/x86-stub.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c index da9b7b8d0716df..0d510c9a06a459 100644 --- 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, |