Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xtensa: fix potential NULL-pointer dereference

Add missing check for memory allocation fail.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Kirill A. Shutemov and committed by
Linus Torvalds
f8c6d30b fecf3743

+5 -1
+5 -1
arch/xtensa/include/asm/pgalloc.h
··· 51 51 static inline pgtable_t pte_alloc_one(struct mm_struct *mm, 52 52 unsigned long addr) 53 53 { 54 + pte_t *pte; 54 55 struct page *page; 55 56 56 - page = virt_to_page(pte_alloc_one_kernel(mm, addr)); 57 + pte = pte_alloc_one_kernel(mm, addr); 58 + if (!pte) 59 + return NULL; 60 + page = virt_to_page(pte); 57 61 pgtable_page_ctor(page); 58 62 return page; 59 63 }