From: Jianguo Wu Date: Thu, 19 Dec 2013 01:08:59 +0000 (-0800) Subject: mm/hugetlb: check for pte NULL pointer in __page_check_address() X-Git-Tag: submit/tizen/20160422.055611~1^2~99^2~18^2~2502^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=98398c32f6687ee1e1f3ae084effb4b75adb0747;p=sdk%2Femulator%2Femulator-kernel.git 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 Cc: Naoya Horiguchi Cc: Mel Gorman Cc: qiuxishi Cc: Hanjun Guo Acked-by: Kirill A. Shutemov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- 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; }