Commit d37de92b authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba

btrfs: fix ulist leaks in error paths of qgroup self tests

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: 442244c9 ("btrfs: qgroup: Switch self test to extent-oriented qgroup mechanism.")
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 92876eec
...@@ -232,8 +232,10 @@ static int test_no_shared_qgroup(struct btrfs_root *root, ...@@ -232,8 +232,10 @@ static int test_no_shared_qgroup(struct btrfs_root *root,
ret = insert_normal_tree_ref(root, nodesize, nodesize, 0, ret = insert_normal_tree_ref(root, nodesize, nodesize, 0,
BTRFS_FS_TREE_OBJECTID); BTRFS_FS_TREE_OBJECTID);
if (ret) if (ret) {
ulist_free(old_roots);
return ret; return ret;
}
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false); ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false);
if (ret) { if (ret) {
...@@ -266,8 +268,10 @@ static int test_no_shared_qgroup(struct btrfs_root *root, ...@@ -266,8 +268,10 @@ static int test_no_shared_qgroup(struct btrfs_root *root,
} }
ret = remove_extent_item(root, nodesize, nodesize); ret = remove_extent_item(root, nodesize, nodesize);
if (ret) if (ret) {
ulist_free(old_roots);
return -EINVAL; return -EINVAL;
}
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false); ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false);
if (ret) { if (ret) {
...@@ -329,8 +333,10 @@ static int test_multiple_refs(struct btrfs_root *root, ...@@ -329,8 +333,10 @@ static int test_multiple_refs(struct btrfs_root *root,
ret = insert_normal_tree_ref(root, nodesize, nodesize, 0, ret = insert_normal_tree_ref(root, nodesize, nodesize, 0,
BTRFS_FS_TREE_OBJECTID); BTRFS_FS_TREE_OBJECTID);
if (ret) if (ret) {
ulist_free(old_roots);
return ret; return ret;
}
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false); ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false);
if (ret) { if (ret) {
...@@ -362,8 +368,10 @@ static int test_multiple_refs(struct btrfs_root *root, ...@@ -362,8 +368,10 @@ static int test_multiple_refs(struct btrfs_root *root,
ret = add_tree_ref(root, nodesize, nodesize, 0, ret = add_tree_ref(root, nodesize, nodesize, 0,
BTRFS_FIRST_FREE_OBJECTID); BTRFS_FIRST_FREE_OBJECTID);
if (ret) if (ret) {
ulist_free(old_roots);
return ret; return ret;
}
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false); ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false);
if (ret) { if (ret) {
...@@ -401,8 +409,10 @@ static int test_multiple_refs(struct btrfs_root *root, ...@@ -401,8 +409,10 @@ static int test_multiple_refs(struct btrfs_root *root,
ret = remove_extent_ref(root, nodesize, nodesize, 0, ret = remove_extent_ref(root, nodesize, nodesize, 0,
BTRFS_FIRST_FREE_OBJECTID); BTRFS_FIRST_FREE_OBJECTID);
if (ret) if (ret) {
ulist_free(old_roots);
return ret; return ret;
}
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false); ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false);
if (ret) { if (ret) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment