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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull EFI fixes from Ingo Molnar:
"Two fixes: an ARM fix for KASLR interaction with hibernation, plus an
efi_test crash fix"

* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi/libstub/arm: Don't randomize runtime regions when CONFIG_HIBERNATION=y
efi/efi_test: Prevent an Oops in efi_runtime_query_capsulecaps()

Linus Torvalds 5cefb4ee 15f859ae

+5 -1
+2 -1
drivers/firmware/efi/libstub/arm-stub.c
··· 238 238 239 239 efi_random_get_seed(sys_table); 240 240 241 - if (!nokaslr()) { 241 + /* hibernation expects the runtime regions to stay in the same place */ 242 + if (!IS_ENABLED(CONFIG_HIBERNATION) && !nokaslr()) { 242 243 /* 243 244 * Randomize the base of the UEFI runtime services region. 244 245 * Preserve the 2 MB alignment of the region by taking a
+3
drivers/firmware/efi/test/efi_test.c
··· 593 593 if (copy_from_user(&qcaps, qcaps_user, sizeof(qcaps))) 594 594 return -EFAULT; 595 595 596 + if (qcaps.capsule_count == ULONG_MAX) 597 + return -EINVAL; 598 + 596 599 capsules = kcalloc(qcaps.capsule_count + 1, 597 600 sizeof(efi_capsule_header_t), GFP_KERNEL); 598 601 if (!capsules)