Unverified Commit 4ca7201e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5916 ext4: fix double-free of blocks due to wrong extents moved_len 

Merge Pull Request from: @ci-robot 
 
PR sync from: Long Li <leo.lilong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/TMOPTMMH4OS3EI26K53NOJQAXMKB7ILN/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9E2F9 
 
Link:https://gitee.com/openeuler/kernel/pulls/5916

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents db04e8d1 089b5aca

fs/ext4/move_extent.c

+2 −4
Original line number Diff line number Diff line
@@ -618,6 +618,7 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk, 
		goto out;

	o_end = o_start + len;



	*moved_len = 0;

	while (o_start < o_end) {

		struct ext4_extent *ex;

		ext4_lblk_t cur_blk, next_blk;
@@ -673,7 +674,7 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk, 
		 */

		ext4_double_up_write_data_sem(orig_inode, donor_inode);

		/* Swap original branches with new branches */

		move_extent_per_page(o_filp, donor_inode,

		*moved_len += move_extent_per_page(o_filp, donor_inode,

				     orig_page_index, donor_page_index,

				     offset_in_page, cur_len,

				     unwritten, &ret);
@@ -683,9 +684,6 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk, 
		o_start += cur_len;

		d_start += cur_len;

	}

	*moved_len = o_start - orig_blk;

	if (*moved_len > len)

		*moved_len = len;



out:

	if (*moved_len) {