瀏覽代碼

arm: handle pgtable_page_ctor() fail

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Kirill A. Shutemov 11 年之前
父節點
當前提交
affce5089a
共有 1 個文件被更改,包括 7 次插入5 次删除
  1. 7 5
      arch/arm/include/asm/pgalloc.h

+ 7 - 5
arch/arm/include/asm/pgalloc.h

@@ -102,12 +102,14 @@ pte_alloc_one(struct mm_struct *mm, unsigned long addr)
 #else
 #else
 	pte = alloc_pages(PGALLOC_GFP, 0);
 	pte = alloc_pages(PGALLOC_GFP, 0);
 #endif
 #endif
-	if (pte) {
-		if (!PageHighMem(pte))
-			clean_pte_table(page_address(pte));
-		pgtable_page_ctor(pte);
+	if (!pte)
+		return NULL;
+	if (!PageHighMem(pte))
+		clean_pte_table(page_address(pte));
+	if (!pgtable_page_ctor(pte)) {
+		__free_page(pte);
+		return NULL;
 	}
 	}
-
 	return pte;
 	return pte;
 }
 }