mm/memblock.c: eliminate potential memleak in memblock_double_array
PATCH 3/3 mm/memblock.c: eliminate potential memleak in memblock_double_array
In memblock_double_array, we don't deal with old_array if we use slab for new_array. So the memory used by old_array may be lost. Add logic to try to free old_array when using slab for new_array.
Signed-off-by Wang Sheng-Hui <[email protected]>
--- mm/memblock.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
mm/memblock.c +6 -2
@@ -250,13 +250,17 @@ static int __init_memblock memblock_double_array(struct memblock_type *type) type->regions = new_array; type->max <<=1 ; -/* If we use SLAB that's it, we are done */ -if (use_slab) +if (use_slab) { +if (memblock_is_region_reserved (__pa (old_array), old_size)) + goto old_memblock; +kfree (old_array);return 0 ; + }/* Add the new reserved region now. Should not fail ! */ BUG_ON (memblock_add_region (&memblock.reserved, addr, new_size)); +old_memblock:/* If the array wasn't our static init one, then free it. We only do * that before SLAB is available as later on, we don't know whether * to use kfree or free_bootmem_pages(). Shouldn't be a big deal
Signature · 8 lines
1.7.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"[email protected]"> [email protected] </a>