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 tag 'efi-fixes-for-v6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi

Pull EFI fixes from Ard Biesheuvel:

- handle potential mremap() failure gracefully

- don't reject EFI memory attributes table version 2

* tag 'efi-fixes-for-v6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
efi: fix potential NULL deref in efi_mem_reserve_persistent
efi: Accept version 2 of memory attributes table

Linus Torvalds a0880c33 a30df1ea

+3 -1
+2
drivers/firmware/efi/efi.c
··· 1007 1007 /* first try to find a slot in an existing linked list entry */ 1008 1008 for (prsv = efi_memreserve_root->next; prsv; ) { 1009 1009 rsv = memremap(prsv, sizeof(*rsv), MEMREMAP_WB); 1010 + if (!rsv) 1011 + return -ENOMEM; 1010 1012 index = atomic_fetch_add_unless(&rsv->count, 1, rsv->size); 1011 1013 if (index < rsv->size) { 1012 1014 rsv->entry[index].base = addr;
+1 -1
drivers/firmware/efi/memattr.c
··· 33 33 return -ENOMEM; 34 34 } 35 35 36 - if (tbl->version > 1) { 36 + if (tbl->version > 2) { 37 37 pr_warn("Unexpected EFI Memory Attributes table version %d\n", 38 38 tbl->version); 39 39 goto unmap;