lkml.org 
[lkml]   [2011]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[061/105] UBIFS: fix oops on error path in read_pnode
    2.6.38-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

    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>

    ---
    fs/ubifs/lpt.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    --- a/fs/ubifs/lpt.c
    +++ b/fs/ubifs/lpt.c
    @@ -1270,10 +1270,9 @@ static int read_pnode(struct ubifs_info
    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



    \
     
     \ /
      Last update: 2011-04-12 16:51    [W:0.020 / U:66.620 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site