Skip to content

Commit 9ceee7d

Browse files
Yunlongsardbiesheuvel
authored andcommitted
firmware/efi: Fix a use after bug in efi_mem_reserve_persistent
In the for loop in efi_mem_reserve_persistent(), prsv = rsv->next use the unmapped rsv. Use the unmapped pages will cause segment fault. Fixes: 18df757 ("efi/memreserve: deal with memreserve entries in unmapped memory") Signed-off-by: Lv Yunlong <[email protected]> Signed-off-by: Ard Biesheuvel <[email protected]>
1 parent 483028e commit 9ceee7d

File tree

1 file changed

+2
-1
lines changed
  • drivers/firmware/efi

1 file changed

+2
-1
lines changed

drivers/firmware/efi/efi.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@ int __ref efi_mem_reserve_persistent(phys_addr_t addr, u64 size)
927927
}
928928

929929
/* first try to find a slot in an existing linked list entry */
930-
for (prsv = efi_memreserve_root->next; prsv; prsv = rsv->next) {
930+
for (prsv = efi_memreserve_root->next; prsv; ) {
931931
rsv = memremap(prsv, sizeof(*rsv), MEMREMAP_WB);
932932
index = atomic_fetch_add_unless(&rsv->count, 1, rsv->size);
933933
if (index < rsv->size) {
@@ -937,6 +937,7 @@ int __ref efi_mem_reserve_persistent(phys_addr_t addr, u64 size)
937937
memunmap(rsv);
938938
return efi_mem_reserve_iomem(addr, size);
939939
}
940+
prsv = rsv->next;
940941
memunmap(rsv);
941942
}
942943

0 commit comments

Comments
 (0)