Commit 91b540f9 authored Aug 25, 2017 by Pavel Tatashin Committed by Linus Torvalds Aug 25, 2017

mm/memblock.c: reversed logic in memblock_discard()

In recently introduced memblock_discard() there is a reversed logic bug.
Memory is freed of static array instead of dynamically allocated one.

Link: http://lkml.kernel.org/r/1503511441-95478-2-git-send-email-pasha.tatashin@oracle.com


Fixes: 3010f876 ("mm: discard memblock data later")
Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
Reported-by: Woody Suwalski <terraluna977@gmail.com>
Tested-by: Woody Suwalski <terraluna977@gmail.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 2b7e8665

mm/memblock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -299,7 +299,7 @@ void __init memblock_discard(void)
		__memblock_free_late(addr, size);
		}

		if (memblock.memory.regions == memblock_memory_init_regions) {
		if (memblock.memory.regions != memblock_memory_init_regions) {
		addr = __pa(memblock.memory.regions);
		size = PAGE_ALIGN(sizeof(struct memblock_region) *
		memblock.memory.max);

Admin message