Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdcae89f authored by Shijie Luo's avatar Shijie Luo Committed by Greg Kroah-Hartman
Browse files

ext4: fix potential error in ext4_do_update_inode 



commit 7d8bd3c76da1d94b85e6c9b7007e20e980bfcfe6 upstream.

If set_large_file = 1 and errors occur in ext4_handle_dirty_metadata(),
the error code will be overridden, go to out_brelse to avoid this
situation.

Signed-off-by: default avatarShijie Luo <luoshijie1@huawei.com>
Link: https://lore.kernel.org/r/20210312065051.36314-1-luoshijie1@huawei.com


Cc: stable@kernel.org
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1523c07d

fs/ext4/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -4626,7 +4626,7 @@ static int ext4_do_update_inode(handle_t *handle, 
	struct ext4_inode_info *ei = EXT4_I(inode);

	struct buffer_head *bh = iloc->bh;

	struct super_block *sb = inode->i_sb;

	int err = 0, rc, block;

	int err = 0, block;

	int need_datasync = 0, set_large_file = 0;

	uid_t i_uid;

	gid_t i_gid;
@@ -4726,9 +4726,9 @@ static int ext4_do_update_inode(handle_t *handle, 
					      bh->b_data);



	BUFFER_TRACE(bh, "call ext4_handle_dirty_metadata");

	rc = ext4_handle_dirty_metadata(handle, NULL, bh);

	if (!err)

		err = rc;

	err = ext4_handle_dirty_metadata(handle, NULL, bh);

	if (err)

		goto out_brelse;

	ext4_clear_inode_state(inode, EXT4_STATE_NEW);

	if (set_large_file) {

		BUFFER_TRACE(EXT4_SB(sb)->s_sbh, "get write access");