lkml.org 
[lkml]   [2014]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 118/144] mm/hugetlb: check for pte NULL pointer in __page_check_address()
    Date
    3.12-stable review patch.  If anyone has any objections, please let me know.

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

    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
    @@ -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;
    }



    \
     
     \ /
      Last update: 2014-01-07 04:41    [W:2.383 / U:0.748 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site