Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37b60809 authored by Shiraz Hashim's avatar Shiraz Hashim Committed by Swathi Sridhar
Browse files

mm/memblock: call kmemleak only for logically mapped region 



On 32bit, memblock_alloc_range_nid can return block of
memory from highmem. Ensure kmemleak is called only for
logically mapped region.

Change-Id: I4491f199437d8401071ba5f98a8b0eedbaf47b00
Signed-off-by: default avatarShiraz Hashim <shashim@codeaurora.org>
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
Signed-off-by: default avatarSudarshan Rajagopalan <sudaraja@codeaurora.org>
parent 0c6f9721

mm/memblock.c

+5 −2
Original line number Diff line number Diff line
@@ -799,7 +799,8 @@ int __init_memblock memblock_free(phys_addr_t base, phys_addr_t size) 
	memblock_dbg("   memblock_free: [%pa-%pa] %pF\n",

		     &base, &end, (void *)_RET_IP_);



	kmemleak_free_part_phys(base, size);

	if (base < memblock.current_limit)

		kmemleak_free_part(__va(base), size);

	return memblock_remove_range(&memblock.reserved, base, size);

}
@@ -1248,7 +1249,9 @@ static phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size, 
		 * The min_count is set to 0 so that memblock allocations are

		 * never reported as leaks.

		 */

		kmemleak_alloc_phys(found, size, 0, 0);

		if (found < memblock.current_limit)

			kmemleak_alloc(__va(found), size, 0, 0);



		return found;

	}

	return 0;