diff options
| author | Miaohe Lin <linmiaohe@huawei.com> | 2022-02-17 22:53:27 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-03-02 11:34:00 +0100 |
| commit | f701f2a037778546984e5cf3c09fbd95522490a2 (patch) | |
| tree | 60c8a9a2a551dd81e9b0e40dce40be9bcb6341de /mm | |
| parent | 8a89dcfb91af2432cdcd29f6649650073b0419bc (diff) | |
| download | linux-stable-f701f2a037778546984e5cf3c09fbd95522490a2.tar.gz linux-stable-f701f2a037778546984e5cf3c09fbd95522490a2.tar.bz2 linux-stable-f701f2a037778546984e5cf3c09fbd95522490a2.zip | |
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: 3010f876500f ("mm: discard memblock data later")
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memblock.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index 5d36b4c54929..91059030fb69 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -260,14 +260,20 @@ void __init memblock_discard(void) addr = __pa(memblock.reserved.regions); size = PAGE_ALIGN(sizeof(struct memblock_region) * memblock.reserved.max); - __memblock_free_late(addr, size); + if (memblock_reserved_in_slab) + kfree(memblock.reserved.regions); + else + __memblock_free_late(addr, size); } if (memblock.memory.regions != memblock_memory_init_regions) { addr = __pa(memblock.memory.regions); size = PAGE_ALIGN(sizeof(struct memblock_region) * memblock.memory.max); - __memblock_free_late(addr, size); + if (memblock_memory_in_slab) + kfree(memblock.memory.regions); + else + __memblock_free_late(addr, size); } } #endif |