btrfs: fix ulist leaks in error paths of qgroup self tests
[ Upstream commit d37de92b38932d40e4a251e876cc388f9aee5f42 ] In the test_no_shared_qgroup() and test_multiple_refs() qgroup self tests, if we fail to add the tree ref, remove the extent item or remove the extent ref, we are returning from the test function without freeing the "old_roots" ulist that was allocated by the previous calls to btrfs_find_all_roots(). Fix that by calling ulist_free() before returning. Fixes: 442244c96332 ("btrfs: qgroup: Switch self test to extent-oriented qgroup mechanism.") Signed-off-by: Filipe Manana <fdmanana@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
61e0612811
commit
0a0dead4ad
@ -237,8 +237,10 @@ static int test_no_shared_qgroup(struct btrfs_root *root,
|
||||
|
||||
ret = insert_normal_tree_ref(root, nodesize, nodesize, 0,
|
||||
BTRFS_FS_TREE_OBJECTID);
|
||||
if (ret)
|
||||
if (ret) {
|
||||
ulist_free(old_roots);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots,
|
||||
false);
|
||||
@ -273,8 +275,10 @@ static int test_no_shared_qgroup(struct btrfs_root *root,
|
||||
}
|
||||
|
||||
ret = remove_extent_item(root, nodesize, nodesize);
|
||||
if (ret)
|
||||
if (ret) {
|
||||
ulist_free(old_roots);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots,
|
||||
false);
|
||||
@ -338,8 +342,10 @@ static int test_multiple_refs(struct btrfs_root *root,
|
||||
|
||||
ret = insert_normal_tree_ref(root, nodesize, nodesize, 0,
|
||||
BTRFS_FS_TREE_OBJECTID);
|
||||
if (ret)
|
||||
if (ret) {
|
||||
ulist_free(old_roots);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots,
|
||||
false);
|
||||
@ -373,8 +379,10 @@ static int test_multiple_refs(struct btrfs_root *root,
|
||||
|
||||
ret = add_tree_ref(root, nodesize, nodesize, 0,
|
||||
BTRFS_FIRST_FREE_OBJECTID);
|
||||
if (ret)
|
||||
if (ret) {
|
||||
ulist_free(old_roots);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots,
|
||||
false);
|
||||
@ -414,8 +422,10 @@ static int test_multiple_refs(struct btrfs_root *root,
|
||||
|
||||
ret = remove_extent_ref(root, nodesize, nodesize, 0,
|
||||
BTRFS_FIRST_FREE_OBJECTID);
|
||||
if (ret)
|
||||
if (ret) {
|
||||
ulist_free(old_roots);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots,
|
||||
false);
|
||||
|
Loading…
x
Reference in New Issue
Block a user