Messages in this thread Patch in this message | | | From | Jiri Slaby <> | Subject | [PATCH 3.12 18/39] m32r: fix potential NULL-pointer dereference | Date | Mon, 25 Jan 2016 12:49:59 +0100 |
| |
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
commit fecf3743b824ce4eb275ed4a1d6aee9494f6a966 upstream.
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> Cc: Oliver Neukum <ONeukum@suse.com> Signed-off-by: Jiri Slaby <jslaby@suse.cz> --- arch/m32r/include/asm/pgalloc.h | 2 ++ 1 file changed, 2 insertions(+)
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; } -- 2.7.0
| |