Commit a6fcced7 authored Feb 17, 2022 by Miaohe Lin Committed by Greg Kroah-Hartman Mar 02, 2022

memblock: use kfree() to release kmalloced memblock regions



commit c94afc46cae7ad41b2ad6a99368147879f4b0e56 upstream.

memblock.{reserved,memory}.regions may be allocated using kmalloc() in
memblock_double_array(). Use kfree() to release these kmalloced regions
indicated by memblock_{reserved,memory}_in_slab.

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Fixes: 3010f876 ("mm: discard memblock data later")
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 9429dfe5

mm/memblock.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -322,6 +322,9 @@ void __init memblock_discard(void)
		addr = __pa(memblock.reserved.regions);
		size = PAGE_ALIGN(sizeof(struct memblock_region) *
		memblock.reserved.max);
		if (memblock_reserved_in_slab)
		kfree(memblock.reserved.regions);
		else
		__memblock_free_late(addr, size);
		}

		@@ -329,6 +332,9 @@ void __init memblock_discard(void)
		addr = __pa(memblock.memory.regions);
		size = PAGE_ALIGN(sizeof(struct memblock_region) *
		memblock.memory.max);
		if (memblock_memory_in_slab)
		kfree(memblock.memory.regions);
		else
		__memblock_free_late(addr, size);
		}
		}