diff options
| author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2013-11-14 23:31:17 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 01:32:15 +0100 |
| commit | 26db39027c00744107acf184527010a1e05907e7 (patch) | |
| tree | 83ca296174827c23f8ce7c0e6053431f870ed2e9 /arch | |
| parent | x86: add missed pgtable_pmd_page_ctor/dtor calls for preallocated pmds (diff) | |
| download | linux-26db39027c00744107acf184527010a1e05907e7.tar.xz linux-26db39027c00744107acf184527010a1e05907e7.zip | |
cris: fix potential NULL-pointer dereference
Add missing check for memory allocation fail.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Mikael Starvik <starvik@axis.com>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/cris/include/asm/pgalloc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/cris/include/asm/pgalloc.h b/arch/cris/include/asm/pgalloc.h index 6da975db112f..d9504d38c276 100644 --- a/arch/cris/include/asm/pgalloc.h +++ b/arch/cris/include/asm/pgalloc.h @@ -32,6 +32,8 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addres { struct page *pte; pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0); + if (!pte) + return NULL; pgtable_page_ctor(pte); return pte; } |