jffs2: NULL return of kmem_cache_zalloc should be handled

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=2072552c33c82e7f0c7adfac7965ecf40b739f1a
Commit:     2072552c33c82e7f0c7adfac7965ecf40b739f1a
Parent:     20171642ed064815fd4372e9e8b1fedff79148f1
Author:     Zhouyi Zhou <zhouzhouyi at gmail.com>
AuthorDate: Mon Dec 2 18:37:05 2013 +0800
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Fri Jan 3 11:22:22 2014 -0800

    jffs2: NULL return of kmem_cache_zalloc should be handled
    
    NULL return of kmem_cache_zalloc should be handled in jffs2_alloc_xattr_datum
    and jff2_alloc_xattr_ref.
    
    Signed-off-by: Zhouyi Zhou <yizhouzhou at ict.ac.cn>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 fs/jffs2/malloc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fs/jffs2/malloc.c b/fs/jffs2/malloc.c
index 4f47aa2..b8fd651 100644
--- a/fs/jffs2/malloc.c
+++ b/fs/jffs2/malloc.c
@@ -288,6 +288,8 @@ struct jffs2_xattr_datum *jffs2_alloc_xattr_datum(void)
 	struct jffs2_xattr_datum *xd;
 	xd = kmem_cache_zalloc(xattr_datum_cache, GFP_KERNEL);
 	dbg_memalloc("%p\n", xd);
+	if (!xd)
+		return NULL;
 
 	xd->class = RAWNODE_CLASS_XATTR_DATUM;
 	xd->node = (void *)xd;
@@ -306,6 +308,8 @@ struct jffs2_xattr_ref *jffs2_alloc_xattr_ref(void)
 	struct jffs2_xattr_ref *ref;
 	ref = kmem_cache_zalloc(xattr_ref_cache, GFP_KERNEL);
 	dbg_memalloc("%p\n", ref);
+	if (!ref)
+		return NULL;
 
 	ref->class = RAWNODE_CLASS_XATTR_REF;
 	ref->node = (void *)ref;