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

!14795 btrfs: fix use-after-free when COWing tree bock and tracing is enabled 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yifan Qiao <qiaoyifan4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/W4EL5QJCXBMIQ4IDDFFBHPU7WBEXBUUP/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBG2PK 
 
Link:https://gitee.com/openeuler/kernel/pulls/14795

 

Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 3bc685f1 6a9dfc35

fs/btrfs/ctree.c

+3 −6
Original line number Diff line number Diff line
@@ -1127,6 +1127,8 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans, 
		btrfs_free_tree_block(trans, root, buf, parent_start,

				      last_ref);

	}



	trace_btrfs_cow_block(root, buf, cow);

	if (unlock_orig)

		btrfs_tree_unlock(buf);

	free_extent_buffer_stale(buf);
@@ -1493,7 +1495,6 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans, 
{

	struct btrfs_fs_info *fs_info = root->fs_info;

	u64 search_start;

	int ret;



	if (test_bit(BTRFS_ROOT_DELETING, &root->state))

		btrfs_err(fs_info,
@@ -1527,12 +1528,8 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans, 
	 * Also We don't care about the error, as it's handled internally.

	 */

	btrfs_qgroup_trace_subtree_after_cow(trans, root, buf);

	ret = __btrfs_cow_block(trans, root, buf, parent,

	return __btrfs_cow_block(trans, root, buf, parent,

				 parent_slot, cow_ret, search_start, 0, nest);



	trace_btrfs_cow_block(root, buf, *cow_ret);



	return ret;

}



/*