From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 6 Jan 2014 20:40:00 +0000 (-0800)
Subject: 3.4-stable patches
X-Git-Tag: v3.4.76~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acbb68b556f00c0b6e5d6d8a290dfeae3e11107e;p=thirdparty%2Fkernel%2Fstable-queue.git

3.4-stable patches

added patches:
	mm-hugetlb-check-for-pte-null-pointer-in-__page_check_address.patch
---

diff --git a/queue-3.4/mm-hugetlb-check-for-pte-null-pointer-in-__page_check_address.patch b/queue-3.4/mm-hugetlb-check-for-pte-null-pointer-in-__page_check_address.patch
new file mode 100644
index 00000000000..a9faf4dc917
--- /dev/null
+++ b/queue-3.4/mm-hugetlb-check-for-pte-null-pointer-in-__page_check_address.patch
@@ -0,0 +1,40 @@
+From 98398c32f6687ee1e1f3ae084effb4b75adb0747 Mon Sep 17 00:00:00 2001
+From: Jianguo Wu <wujianguo@huawei.com>
+Date: Wed, 18 Dec 2013 17:08:59 -0800
+Subject: mm/hugetlb: check for pte NULL pointer in __page_check_address()
+
+From: Jianguo Wu <wujianguo@huawei.com>
+
+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 <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>
+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
+@@ -623,7 +623,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;
+ 	}
diff --git a/queue-3.4/series b/queue-3.4/series
index ebe6de19823..121ec2c3154 100644
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -30,3 +30,4 @@ cpupower-fix-segfault-due-to-incorrect-getopt_long-arugments.patch
 libata-add-ata_horkage_broken_fpdma_aa-quirk-for-seagate-momentus-spinpoint-m8.patch
 radiotap-fix-bitmap-end-finding-buffer-overrun.patch
 rtlwifi-pci-fix-oops-on-driver-unload.patch
+mm-hugetlb-check-for-pte-null-pointer-in-__page_check_address.patch