lkml.org 
[lkml]   [2014]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16 353/357] ext4: avoid trying to kfree an ERR_PTR pointer
    Date
    3.16-stable review patch.  If anyone has any objections, please let me know.

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

    From: Theodore Ts'o <tytso@mit.edu>

    commit a9cfcd63e8d206ce4235c355d857c4fbdf0f4587 upstream.

    Thanks to Dan Carpenter for extending smatch to find bugs like this.
    (This was found using a development version of smatch.)

    Fixes: 36de928641ee48b2078d3fe9514242aaa2f92013
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ext4/namei.c | 2 ++
    fs/ext4/resize.c | 2 ++
    2 files changed, 4 insertions(+)

    --- a/fs/ext4/namei.c
    +++ b/fs/ext4/namei.c
    @@ -3240,6 +3240,7 @@ static int ext4_rename(struct inode *old
    &new.de, &new.inlined);
    if (IS_ERR(new.bh)) {
    retval = PTR_ERR(new.bh);
    + new.bh = NULL;
    goto end_rename;
    }
    if (new.bh) {
    @@ -3386,6 +3387,7 @@ static int ext4_cross_rename(struct inod
    &new.de, &new.inlined);
    if (IS_ERR(new.bh)) {
    retval = PTR_ERR(new.bh);
    + new.bh = NULL;
    goto end_rename;
    }

    --- a/fs/ext4/resize.c
    +++ b/fs/ext4/resize.c
    @@ -575,6 +575,7 @@ handle_bb:
    bh = bclean(handle, sb, block);
    if (IS_ERR(bh)) {
    err = PTR_ERR(bh);
    + bh = NULL;
    goto out;
    }
    overhead = ext4_group_overhead_blocks(sb, group);
    @@ -603,6 +604,7 @@ handle_ib:
    bh = bclean(handle, sb, block);
    if (IS_ERR(bh)) {
    err = PTR_ERR(bh);
    + bh = NULL;
    goto out;
    }




    \
     
     \ /
      Last update: 2014-10-04 00:42    [W:4.487 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site