From f36b1a101c21b61b581468fb69af5df3eb9d2f1c Mon Sep 17 00:00:00 2001
From: Zhou Guanghui <zhouguanghui1@huawei.com>
Date: Mon, 11 Nov 2019 11:51:08 +0800
Subject: [PATCH] mm/hugetlb: Check nid when alloc hugepage

ascend inclusion
category: bugfix
bugzilla: NA
CVE: NA

------------

Check nid when alloc hugepage.

Signed-off-by: Zhou Guanghui <zhouguanghui1@huawei.com>
Signed-off-by: Lijun Fang <fanglijun3@huawei.com>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 mm/hugetlb.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 833ab71427a0..55ae913ccf01 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -5136,6 +5136,11 @@ EXPORT_SYMBOL_GPL(hugetlb_get_hstate);
  */
 struct page *hugetlb_alloc_hugepage(int nid)
 {
+	VM_WARN_ON(nid < 0 || nid >= MAX_NUMNODES);
+
+	if (nid == NUMA_NO_NODE)
+		nid = numa_mem_id();
+
 	return alloc_huge_page_node(&default_hstate, nid);
 }
 EXPORT_SYMBOL_GPL(hugetlb_alloc_hugepage);
-- 
GitLab