aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXishi Qiu <qiuxishi@huawei.com>2016-04-01 17:31:20 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-01 18:03:37 -0400
commit6f25a14a7053b69917e2ebea0d31dd444cd31fd5 (patch)
tree48914967e96ffd5e054252cab541f15f768323ee
parent969e8d7e47f93ef693028667480558de8f70523f (diff)
mm: fix invalid node in alloc_migrate_target()
It is incorrect to use next_node to find a target node, it will return MAX_NUMNODES or invalid node. This will lead to crash in buddy system allocation. Fixes: c8721bbbdd36 ("mm: memory-hotplug: enable memory hotplug to handle hugepage") Signed-off-by: Xishi Qiu <qiuxishi@huawei.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> Acked-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Cc: Joonsoo Kim <js1304@gmail.com> Cc: David Rientjes <rientjes@google.com> Cc: "Laura Abbott" <lauraa@codeaurora.org> Cc: Hui Zhu <zhuhui@xiaomi.com> Cc: Wang Xiaoqiang <wangxq10@lzu.edu.cn> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/page_isolation.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/page_isolation.c b/mm/page_isolation.c
index 92c4c36501e7..31555b689eb9 100644
--- a/mm/page_isolation.c
+++ b/mm/page_isolation.c
@@ -289,11 +289,11 @@ struct page *alloc_migrate_target(struct page *page, unsigned long private,
289 * now as a simple work-around, we use the next node for destination. 289 * now as a simple work-around, we use the next node for destination.
290 */ 290 */
291 if (PageHuge(page)) { 291 if (PageHuge(page)) {
292 nodemask_t src = nodemask_of_node(page_to_nid(page)); 292 int node = next_online_node(page_to_nid(page));
293 nodemask_t dst; 293 if (node == MAX_NUMNODES)
294 nodes_complement(dst, src); 294 node = first_online_node;
295 return alloc_huge_page_node(page_hstate(compound_head(page)), 295 return alloc_huge_page_node(page_hstate(compound_head(page)),
296 next_node(page_to_nid(page), dst)); 296 node);
297 } 297 }
298 298
299 if (PageHighMem(page)) 299 if (PageHighMem(page))