aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill A. Shutemov2013-11-14 14:31:18 -0800
committerLinus Torvalds2013-11-15 09:32:15 +0900
commitfecf3743b824ce4eb275ed4a1d6aee9494f6a966 (patch)
treec7de27cd29a2b8896e605364a20bc3783ed5e06c
parent26db39027c00744107acf184527010a1e05907e7 (diff)
m32r: fix potential NULL-pointer dereference
Add missing check for memory allocation fail. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/m32r/include/asm/pgalloc.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m32r/include/asm/pgalloc.h b/arch/m32r/include/asm/pgalloc.h
index 0fc736198979..ac4208bcc5ad 100644
--- a/arch/m32r/include/asm/pgalloc.h
+++ b/arch/m32r/include/asm/pgalloc.h
@@ -43,6 +43,8 @@ static __inline__ pgtable_t pte_alloc_one(struct mm_struct *mm,
{
struct page *pte = alloc_page(GFP_KERNEL|__GFP_ZERO);
+ if (!pte)
+ return NULL;
pgtable_page_ctor(pte);
return pte;
}