[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <598881da2122c95d2558927f0c3f09c0d283e895.1453722244.git.jslaby@suse.cz>
Date: Mon, 25 Jan 2016 12:49:59 +0100
From: Jiri Slaby <jslaby@...e.cz>
To: stable@...r.kernel.org
Cc: linux-kernel@...r.kernel.org,
"Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>,
Hirokazu Takata <takata@...ux-m32r.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Oliver Neukum <ONeukum@...e.com>, Jiri Slaby <jslaby@...e.cz>
Subject: [PATCH 3.12 18/39] m32r: fix potential NULL-pointer dereference
From: "Kirill A. Shutemov" <kirill.shutemov@...ux.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@...ux.intel.com>
Cc: Hirokazu Takata <takata@...ux-m32r.org>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Oliver Neukum <ONeukum@...e.com>
Signed-off-by: Jiri Slaby <jslaby@...e.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
Powered by blists - more mailing lists