summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-03-25 19:09:54 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-14 16:53:29 -0700
commit5cb4b8544380d9d776737418aedd871ff5403adb (patch)
treecd6644209ce968d71ce50e62363db524cb4266c8
parentb7236edfb8caffe3d9348999e13c972666e96b44 (diff)
downloadlinux-stable-5cb4b8544380d9d776737418aedd871ff5403adb.tar.gz
linux-stable-5cb4b8544380d9d776737418aedd871ff5403adb.tar.bz2
linux-stable-5cb4b8544380d9d776737418aedd871ff5403adb.zip
UBIFS: fix oops on error path in read_pnode
commit 54acbaaa523ca0bd284a18f67ad213c379679e86 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-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 b2792e84d245..d0dfe7a0dedf 100644
--- a/fs/ubifs/lpt.c
+++ b/fs/ubifs/lpt.c
@@ -1269,10 +1269,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