aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-03-25 19:09:54 +0200
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-04-05 10:40:31 +0300
commit54acbaaa523ca0bd284a18f67ad213c379679e86 (patch)
treec6ed0d74270ef84bc605d71feaa09b0511ccece6 /fs
parent8b229c76765816796eec7ccd428f03bd8de8b525 (diff)
downloadkernel_samsung_smdk4412-54acbaaa523ca0bd284a18f67ad213c379679e86.zip
kernel_samsung_smdk4412-54acbaaa523ca0bd284a18f67ad213c379679e86.tar.gz
kernel_samsung_smdk4412-54acbaaa523ca0bd284a18f67ad213c379679e86.tar.bz2
UBIFS: fix oops on error path in read_pnode
Thanks to coverity which spotted that UBIFS will oops if 'kmalloc()' in 'read_pnode()' fails and we dereference a NULL 'pnode' pointer when we 'goto out'. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Cc: stable@kernel.org
Diffstat (limited to 'fs')
-rw-r--r--fs/ubifs/lpt.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c
index 72775d3..ef5155e 100644
--- a/fs/ubifs/lpt.c
+++ b/fs/ubifs/lpt.c
@@ -1270,10 +1270,9 @@ static int read_pnode(struct ubifs_info *c, struct ubifs_nnode *parent, int iip)
lnum = branch->lnum;
offs = branch->offs;
pnode = kzalloc(sizeof(struct ubifs_pnode), GFP_NOFS);
- if (!pnode) {
- err = -ENOMEM;
- goto out;
- }
+ if (!pnode)
+ return -ENOMEM;
+
if (lnum == 0) {
/*
* This pnode was not written which just means that the LEB