lkml.org 
[lkml]   [2016]   [Oct]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 20/25] ext4: release bh in make_indexed_dir
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: gmail <yngsion@gmail.com>

    commit e81d44778d1d57bbaef9e24c4eac7c8a7a401d40 upstream.

    The commit 6050d47adcad: "ext4: bail out from make_indexed_dir() on
    first error" could end up leaking bh2 in the error path.

    [ Also avoid renaming bh2 to bh, which just confuses things --tytso ]

    Signed-off-by: yangsheng <yngsion@gmail.com>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ext4/namei.c | 14 ++++++--------
    1 file changed, 6 insertions(+), 8 deletions(-)

    --- a/fs/ext4/namei.c
    +++ b/fs/ext4/namei.c
    @@ -2017,33 +2017,31 @@ static int make_indexed_dir(handle_t *ha
    frame->entries = entries;
    frame->at = entries;
    frame->bh = bh;
    - bh = bh2;

    retval = ext4_handle_dirty_dx_node(handle, dir, frame->bh);
    if (retval)
    goto out_frames;
    - retval = ext4_handle_dirty_dirent_node(handle, dir, bh);
    + retval = ext4_handle_dirty_dirent_node(handle, dir, bh2);
    if (retval)
    goto out_frames;

    - de = do_split(handle,dir, &bh, frame, &fname->hinfo);
    + de = do_split(handle,dir, &bh2, frame, &fname->hinfo);
    if (IS_ERR(de)) {
    retval = PTR_ERR(de);
    goto out_frames;
    }
    - dx_release(frames);

    - retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh);
    - brelse(bh);
    - return retval;
    + retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2);
    out_frames:
    /*
    * Even if the block split failed, we have to properly write
    * out all the changes we did so far. Otherwise we can end up
    * with corrupted filesystem.
    */
    - ext4_mark_inode_dirty(handle, dir);
    + if (retval)
    + ext4_mark_inode_dirty(handle, dir);
    dx_release(frames);
    + brelse(bh2);
    return retval;
    }


    \
     
     \ /
      Last update: 2016-10-21 11:44    [W:4.168 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site