diff options
| author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2011-03-25 19:09:54 +0200 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2011-04-30 16:53:28 +0200 |
| commit | acd3bc5b828d5f7b4a52259467de573f73498bf1 (patch) | |
| tree | fe62072656de3acbadaae023ab3753a66e266dd3 | |
| parent | 8356f8768ac881a9fa1bd30f74912817a71d407b (diff) | |
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.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c index 9ff2463177e..700a9258192 100644 --- a/fs/ubifs/lpt.c +++ b/fs/ubifs/lpt.c @@ -1240,10 +1240,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 |