iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Batch #3 of EFI fixes for v6.2

Browse Source 
- handle potential mremap() failure gracefully
 
 - don't reject EFI memory attributes table version 2
 -----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCgAdFiEE+9lifEBpyUIVN1cpw08iOZLZjyQFAmPdFTQACgkQw08iOZLZ
 jyTiYwwAp56wBGhjBhKjO/SASVGxE7MmRuj8lEM9joFGxqjbXP7JVCzVEpSTep4Y
 ua3Ct0v4P7iDOVK29R1X6d9bM2SF5dw+3K6QZ/LF/ytJKgT6/R1gDFx/1nyR0nhw
 S/3G/bEjnB/VbUN4gVBuqPu0QAH1soe4AK07KZoaAzJ04Hs9ZStvO6Dc6qz6StWc
 AERF/n8dOZXaTv2OZHE8LSn0vv47RLhjuRDypb6iV2I1OOgtLERQi/cu6p0Ppu9W
 qckcaPg8eNUCtid4zOTUAaE569mfSB5mWjKeWkdYBnqQWgW9ufg4MdwZaEeLNbEf
 8b5aG1vWHVa2DAZkZk+umwICW8pk3m9qeHKErisqV+MJmjHjue1vgz8w7pqKxvvi
 sqL7eJN5HV+MycQ0fbd1zQOK9UJAhoG48Z3PoraBmQMfZJ1BtDCuu5B9+uxMq+e5
 GCEdnOB/WOaIy0L6N08FHgHP/TBhJnE4KmRRr7es+avcifRJd7XjlOjhnB2ASrHk
 f7ToNE6+
 =s4Yz
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2023-02-03 10:25:41 -08:00
commit a0880c3379
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/firmware/efi/efi.c
View File

@ -1007,6 +1007,8 @@ int __ref efi_mem_reserve_persistent(phys_addr_t addr, u64 size)
/* first try to find a slot in an existing linked list entry */
for (prsv = efi_memreserve_root->next; prsv; ) {
rsv = memremap(prsv, sizeof(*rsv), MEMREMAP_WB);
if (!rsv)
return -ENOMEM;
index = atomic_fetch_add_unless(&rsv->count, 1, rsv->size);
if (index < rsv->size) {
rsv->entry[index].base = addr;

2
drivers/firmware/efi/memattr.c
View File

@ -33,7 +33,7 @@ int __init efi_memattr_init(void)
return -ENOMEM;
}
if (tbl->version > 1) {
if (tbl->version > 2) {
pr_warn("Unexpected EFI Memory Attributes table version %d\n",
tbl->version);
goto unmap;