diff options
| author | Pavel Tatashin <pasha.tatashin@oracle.com> | 2017-08-25 15:55:46 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-30 10:26:34 +0200 |
| commit | 1c229d7ad7b91136a3ae904ecbba305c95577b92 (patch) | |
| tree | 0450e7ffb53b2f9bbb1f655547f7a4372fce8530 | |
| parent | f5024bb32d4d50b77f4fbc1e7251cf0f21def88e (diff) | |
| download | linux-stable-1c229d7ad7b91136a3ae904ecbba305c95577b92.tar.gz linux-stable-1c229d7ad7b91136a3ae904ecbba305c95577b92.tar.bz2 linux-stable-1c229d7ad7b91136a3ae904ecbba305c95577b92.zip | |
mm/memblock.c: reversed logic in memblock_discard()
commit 91b540f98872a206ea1c49e4aa6ea8eed0886644 upstream.
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: 3010f876500f ("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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | mm/memblock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index 7087d5578866..43d0919e29f3 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -302,7 +302,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); |