From: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Date: Thu, 14 Nov 2013 22:31:47 +0000 (-0800) Subject: x86: handle pgtable_page_ctor() fail X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=cecbd1b5afb01ed6ee14e14234b2e8c52e26c841;p=openwrt%2Fstaging%2Fblogic.git x86: handle pgtable_page_ctor() fail Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> --- diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 1a7d21342e02..a7cccb6d7fec 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -25,8 +25,12 @@ pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address) struct page *pte; pte = alloc_pages(__userpte_alloc_gfp, 0); - if (pte) - pgtable_page_ctor(pte); + if (!pte) + return NULL; + if (!pgtable_page_ctor(pte)) { + __free_page(pte); + return NULL; + } return pte; }