Subject: [merged] mm-hugetlb-check-for-pte-null-pointer-in-__page_check_address.patch removed from -mm tree
To: wujianguo@xxxxxxxxxx,guohanjun@xxxxxxxxxx,kirill.shutemov@xxxxxxxxxxxxxxx,mgorman@xxxxxxx,n-horiguchi@xxxxxxxxxxxxx,qiuxishi@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 19 Dec 2013 11:54:09 -0800
The patch titled
Subject: mm/hugetlb: check for pte NULL pointer in __page_check_address()
has been removed from the -mm tree. Its filename was
mm-hugetlb-check-for-pte-null-pointer-in-__page_check_address.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Jianguo Wu <wujianguo@xxxxxxxxxx>
Subject: 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@xxxxxxxxxx>
Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxx>
Cc: qiuxishi <qiuxishi@xxxxxxxxxx>
Cc: Hanjun Guo <guohanjun@xxxxxxxxxx>
Acked-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/rmap.c | 4 ++++
1 file changed, 4 insertions(+)
diff -puN mm/rmap.c~mm-hugetlb-check-for-pte-null-pointer-in-__page_check_address mm/rmap.c
--- a/mm/rmap.c~mm-hugetlb-check-for-pte-null-pointer-in-__page_check_address
+++ a/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 = huge_pte_lockptr(page_hstate(page), mm, pte);
goto check;
}
_
Patches currently in -mm which might be from wujianguo@xxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
