diff options
| author | Zhouyi Zhou <zhouzhouyi@gmail.com> | 2013-12-02 18:37:05 +0800 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-01-03 11:22:22 -0800 |
| commit | 2072552c33c82e7f0c7adfac7965ecf40b739f1a (patch) | |
| tree | 0a41b8eea90ce58e35bc92b94e7af6c544641d8f /fs | |
| parent | 20171642ed064815fd4372e9e8b1fedff79148f1 (diff) | |
| download | linux-stable-2072552c33c82e7f0c7adfac7965ecf40b739f1a.tar.gz linux-stable-2072552c33c82e7f0c7adfac7965ecf40b739f1a.tar.bz2 linux-stable-2072552c33c82e7f0c7adfac7965ecf40b739f1a.zip | |
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@ict.ac.cn>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jffs2/malloc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/jffs2/malloc.c b/fs/jffs2/malloc.c index 4f47aa24b556..b8fd651307a4 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; |