Skip to content

Commit 9e46e4d

Browse files
rikvanrielrppt
authored andcommitted
mm,memblock: reset memblock.reserved to system init state to prevent UAF
The memblock_discard function frees the memblock.reserved.regions array, which is good. However, if a subsequent memblock_free (or memblock_phys_free) comes in later, from for example ima_free_kexec_buffer, that will result in a use after free bug in memblock_isolate_range. When running a kernel with CONFIG_KASAN enabled, this will cause a kernel panic very early in boot. Without CONFIG_KASAN, there is a chance that memblock_isolate_range might scribble on memory that is now in use by somebody else. Avoid those issues by making sure that memblock_discard points memblock.reserved.regions back at the static buffer. If memblock_free is called after memblock memory is discarded, that will print a warning in memblock_remove_region. Signed-off-by: Rik van Riel <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mike Rapoport (IBM) <[email protected]>
1 parent 6eaae19 commit 9e46e4d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

mm/memblock.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,10 @@ void __init memblock_discard(void)
374374
kfree(memblock.reserved.regions);
375375
else
376376
memblock_free_late(addr, size);
377+
/* Reset to prevent UAF from stray frees. */
378+
memblock.reserved.regions = memblock_reserved_init_regions;
379+
memblock.reserved.cnt = 1;
380+
memblock_remove_region(&memblock.reserved, 0);
377381
}
378382

379383
if (memblock.memory.regions != memblock_memory_init_regions) {

0 commit comments

Comments
 (0)