diff options
| author | Lukas Czerner <lczerner@redhat.com> | 2019-03-15 05:15:32 +0100 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-03-15 05:15:32 +0100 |
| commit | d64264d6218e6892edd832dc3a5a5857c2856c53 (patch) | |
| tree | 74e45f6d49c954cbc67b645cfc9044ace4115ebf /fs/ext4 | |
| parent | ext4: remove useless ext4_pin_inode() (diff) | |
| download | linux-d64264d6218e6892edd832dc3a5a5857c2856c53.tar.xz linux-d64264d6218e6892edd832dc3a5a5857c2856c53.zip | |
ext4: add missing brelse() in add_new_gdb_meta_bg()
Currently in add_new_gdb_meta_bg() there is a missing brelse of gdb_bh
in case ext4_journal_get_write_access() fails.
Additionally kvfree() is missing in the same error path. Fix it by
moving the ext4_journal_get_write_access() before the ext4 sb update as
Ted suggested and release n_group_desc and gdb_bh in case it fails.
Fixes: 61a9c11e5e7a ("ext4: add missing brelse() add_new_gdb_meta_bg()'s error path")
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/resize.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 3d9b18505c0c..90061c3d048b 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -932,11 +932,18 @@ static int add_new_gdb_meta_bg(struct super_block *sb, memcpy(n_group_desc, o_group_desc, EXT4_SB(sb)->s_gdb_count * sizeof(struct buffer_head *)); n_group_desc[gdb_num] = gdb_bh; + + BUFFER_TRACE(gdb_bh, "get_write_access"); + err = ext4_journal_get_write_access(handle, gdb_bh); + if (err) { + kvfree(n_group_desc); + brelse(gdb_bh); + return err; + } + EXT4_SB(sb)->s_group_desc = n_group_desc; EXT4_SB(sb)->s_gdb_count++; kvfree(o_group_desc); - BUFFER_TRACE(gdb_bh, "get_write_access"); - err = ext4_journal_get_write_access(handle, gdb_bh); return err; } |