Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'fixes-2022-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
Pull memblock fix from Mike Rapoport:
"Use kfree() to release kmalloced memblock regions
memblock.{reserved,memory}.regions may be allocated using kmalloc()
in memblock_double_array(). Use kfree() to release these kmalloced
regions"
* tag 'fixes-2022-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
memblock: use kfree() to release kmalloced memblock regions
+8
-2
+8
-2
mm/memblock.c
+8
-2
mm/memblock.c
···
366
366
addr = __pa(memblock.reserved.regions);
367
367
size = PAGE_ALIGN(sizeof(struct memblock_region) *
368
368
memblock.reserved.max);
369
-
memblock_free_late(addr, size);
369
+
if (memblock_reserved_in_slab)
370
+
kfree(memblock.reserved.regions);
371
+
else
372
+
memblock_free_late(addr, size);
370
373
}
371
374
372
375
if (memblock.memory.regions != memblock_memory_init_regions) {
373
376
addr = __pa(memblock.memory.regions);
374
377
size = PAGE_ALIGN(sizeof(struct memblock_region) *
375
378
memblock.memory.max);
376
-
memblock_free_late(addr, size);
379
+
if (memblock_memory_in_slab)
380
+
kfree(memblock.memory.regions);
381
+
else
382
+
memblock_free_late(addr, size);
377
383
}
378
384
379
385
memblock_memory = NULL;