| Message ID | 20220914100859.1415196-1-yebin10@huawei.com |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | [-next] ext4: fix miss release buffer head in ext4_fc_write_inode | expand |
On Wed 14-09-22 18:08:59, Ye Bin wrote: > In 'ext4_fc_write_inode' function first call 'ext4_get_inode_loc' get 'iloc', > after use it miss release 'iloc.bh'. > So just release 'iloc.bh' before 'ext4_fc_write_inode' return. > > Signed-off-by: Ye Bin <yebin10@huawei.com> Yes, nice. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/ext4/fast_commit.c | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c > index 2af962cbb835..b7414a5812f6 100644 > --- a/fs/ext4/fast_commit.c > +++ b/fs/ext4/fast_commit.c > @@ -874,22 +874,25 @@ static int ext4_fc_write_inode(struct inode *inode, u32 *crc) > tl.fc_tag = cpu_to_le16(EXT4_FC_TAG_INODE); > tl.fc_len = cpu_to_le16(inode_len + sizeof(fc_inode.fc_ino)); > > + ret = -ECANCELED; > dst = ext4_fc_reserve_space(inode->i_sb, > sizeof(tl) + inode_len + sizeof(fc_inode.fc_ino), crc); > if (!dst) > - return -ECANCELED; > + goto err; > > if (!ext4_fc_memcpy(inode->i_sb, dst, &tl, sizeof(tl), crc)) > - return -ECANCELED; > + goto err; > dst += sizeof(tl); > if (!ext4_fc_memcpy(inode->i_sb, dst, &fc_inode, sizeof(fc_inode), crc)) > - return -ECANCELED; > + goto err; > dst += sizeof(fc_inode); > if (!ext4_fc_memcpy(inode->i_sb, dst, (u8 *)ext4_raw_inode(&iloc), > inode_len, crc)) > - return -ECANCELED; > - > - return 0; > + goto err; > + ret = 0; > +err: > + brelse(iloc.bh); > + return ret; > } > > /* > -- > 2.31.1 >
On Wed, 14 Sep 2022 18:08:59 +0800, Ye Bin wrote: > In 'ext4_fc_write_inode' function first call 'ext4_get_inode_loc' get 'iloc', > after use it miss release 'iloc.bh'. > So just release 'iloc.bh' before 'ext4_fc_write_inode' return. > > Applied, thanks! [1/1] ext4: fix miss release buffer head in ext4_fc_write_inode commit: 4937c59dc3958303e35f68fd345a4e063b39c20f Best regards,
diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index 2af962cbb835..b7414a5812f6 100644 --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -874,22 +874,25 @@ static int ext4_fc_write_inode(struct inode *inode, u32 *crc) tl.fc_tag = cpu_to_le16(EXT4_FC_TAG_INODE); tl.fc_len = cpu_to_le16(inode_len + sizeof(fc_inode.fc_ino)); + ret = -ECANCELED; dst = ext4_fc_reserve_space(inode->i_sb, sizeof(tl) + inode_len + sizeof(fc_inode.fc_ino), crc); if (!dst) - return -ECANCELED; + goto err; if (!ext4_fc_memcpy(inode->i_sb, dst, &tl, sizeof(tl), crc)) - return -ECANCELED; + goto err; dst += sizeof(tl); if (!ext4_fc_memcpy(inode->i_sb, dst, &fc_inode, sizeof(fc_inode), crc)) - return -ECANCELED; + goto err; dst += sizeof(fc_inode); if (!ext4_fc_memcpy(inode->i_sb, dst, (u8 *)ext4_raw_inode(&iloc), inode_len, crc)) - return -ECANCELED; - - return 0; + goto err; + ret = 0; +err: + brelse(iloc.bh); + return ret; } /*
In 'ext4_fc_write_inode' function first call 'ext4_get_inode_loc' get 'iloc', after use it miss release 'iloc.bh'. So just release 'iloc.bh' before 'ext4_fc_write_inode' return. Signed-off-by: Ye Bin <yebin10@huawei.com> --- fs/ext4/fast_commit.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)