Commit 94a502eb authored by Linus Torvalds's avatar Linus Torvalds

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
parents 360f0342 01638431
...@@ -787,6 +787,8 @@ static efi_status_t efi_decompress_kernel(unsigned long *kernel_entry) ...@@ -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"); efi_debug("AMI firmware v2.0 or older detected - disabling physical KASLR\n");
seed[0] = 0; seed[0] = 0;
} }
boot_params_ptr->hdr.loadflags |= KASLR_FLAG;
} }
status = efi_random_alloc(alloc_size, CONFIG_PHYSICAL_ALIGN, &addr, status = efi_random_alloc(alloc_size, CONFIG_PHYSICAL_ALIGN, &addr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment