lkml.org 
[lkml]   [2012]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 031/196] UBIFS: fix oops on error path in read_pnode
    Date
    From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    If you see a problem with using this for longterm, please comment.
    -------------------

    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: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    fs/ubifs/lpt.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c
    index ad7f67b..ead230e 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
    --
    1.7.9.3


    \
     
     \ /
      Last update: 2012-03-13 01:21    [W:2.649 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site