Thread (131 messages) 131 messages, 5 authors, 2014-01-08
STALE4571d REVIEWED: 1 (0M)

[PATCH 3.10 077/129] mm/hugetlb: check for pte NULL pointer in __page_check_address()

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2014-01-06 23:18:14
Also in: lkml

3.10-stable review patch.  If anyone has any objections, please let me know.

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

From: Jianguo Wu <redacted>

commit 98398c32f6687ee1e1f3ae084effb4b75adb0747 upstream.

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 <redacted>
Cc: Naoya Horiguchi <redacted>
Cc: Mel Gorman <mgorman@suse.de>
Cc: qiuxishi <redacted>
Cc: Hanjun Guo <guohanjun@huawei.com>
Acked-by: Kirill A. Shutemov <redacted>
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>

---
 mm/rmap.c |    4 ++++
 1 file changed, 4 insertions(+)
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -600,7 +600,11 @@ pte_t *__page_check_address(struct page
 	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 = &mm->page_table_lock;
 		goto check;
 	}

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help