Skip to content

Commit

Permalink
UBIFS: fix oops on error path in read_pnode
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Artem Bityutskiy authored and Artem Bityutskiy committed Apr 5, 2011
1 parent 8b229c7 commit 54acbaa
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions fs/ubifs/lpt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 54acbaa

Please sign in to comment.