Commit ff50a724 authored by gmail's avatar gmail Committed by Greg Kroah-Hartman

ext4: release bh in make_indexed_dir

commit e81d4477 upstream.

The commit 6050d47a: "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: default avataryangsheng <yngsion@gmail.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 99fa4c50
...@@ -2044,33 +2044,31 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, ...@@ -2044,33 +2044,31 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname,
frame->entries = entries; frame->entries = entries;
frame->at = entries; frame->at = entries;
frame->bh = bh; frame->bh = bh;
bh = bh2;
retval = ext4_handle_dirty_dx_node(handle, dir, frame->bh); retval = ext4_handle_dirty_dx_node(handle, dir, frame->bh);
if (retval) if (retval)
goto out_frames; goto out_frames;
retval = ext4_handle_dirty_dirent_node(handle, dir, bh); retval = ext4_handle_dirty_dirent_node(handle, dir, bh2);
if (retval) if (retval)
goto out_frames; 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)) { if (IS_ERR(de)) {
retval = PTR_ERR(de); retval = PTR_ERR(de);
goto out_frames; goto out_frames;
} }
dx_release(frames);
retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh); retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2);
brelse(bh);
return retval;
out_frames: out_frames:
/* /*
* Even if the block split failed, we have to properly write * Even if the block split failed, we have to properly write
* out all the changes we did so far. Otherwise we can end up * out all the changes we did so far. Otherwise we can end up
* with corrupted filesystem. * with corrupted filesystem.
*/ */
ext4_mark_inode_dirty(handle, dir); if (retval)
ext4_mark_inode_dirty(handle, dir);
dx_release(frames); dx_release(frames);
brelse(bh2);
return retval; return retval;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment