summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJianguo Wu <wujianguo@huawei.com>2013-12-18 17:08:59 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-18 19:04:52 -0800
commit98398c32f6687ee1e1f3ae084effb4b75adb0747 (patch)
treeb260bca32fc6148340d88e1cdf1f8eb646e4f3f0
parent7ac181568342ec618d4da1ab03c2babcaa7ee84f (diff)
downloadlinux-98398c32f6687ee1e1f3ae084effb4b75adb0747.tar.gz
mm/hugetlb: check for pte NULL pointer in __page_check_address()
In __page_check_address(), if address's pud is not present, huge_pte_offset() will return NULL, we should check the return value. Signed-off-by: Jianguo Wu <wujianguo@huawei.com> Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Cc: Mel Gorman <mgorman@suse.de> Cc: qiuxishi <qiuxishi@huawei.com> Cc: Hanjun Guo <guohanjun@huawei.com> Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/rmap.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/rmap.c b/mm/rmap.c
index 55c8b8dc9ffb..068522d8502a 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -600,7 +600,11 @@ pte_t *__page_check_address(struct page *page, struct mm_struct *mm,
spinlock_t *ptl;
if (unlikely(PageHuge(page))) {
+ /* when pud is not present, pte will be NULL */
pte = huge_pte_offset(mm, address);
+ if (!pte)
+ return NULL;
+
ptl = huge_pte_lockptr(page_hstate(page), mm, pte);
goto check;
}