btrfs: fix double unlock bugs in btrfs_compare_trees()
Subsystems (2)
PATCH 1/1 btrfs: fix double unlock bugs in btrfs_compare_trees()
These error paths unlock before the goto, but the goto also unlocks so it's a double unlock.
Fixes 5646ffa863d0 ("btrfs: make send work with concurrent block group relocation")
Signed-off-by Dan Carpenter <[email protected]>
--- fs/btrfs/send.c | 2 -- 1 file changed, 2 deletions(-)
fs/btrfs/send.c +0 -2
@@ -7152,7 +7152,6 @@ static int btrfs_compare_trees(struct btrfs_root *left_root, left_path->nodes[left_level] =btrfs_clone_extent_buffer (left_root->commit_root);if (!left_path->nodes[left_level]) { -up_read (&fs_info->commit_root_sem); ret = -ENOMEM ; goto out; }
@@ -7162,7 +7161,6 @@ static int btrfs_compare_trees(struct btrfs_root *left_root, right_path->nodes[right_level] =btrfs_clone_extent_buffer (right_root->commit_root);if (!right_path->nodes[right_level]) { -up_read (&fs_info->commit_root_sem); ret = -ENOMEM ; goto out; }
Signature · 1 line
2.20.1
Quoted 2 lines · Dan Carpenter
These error paths unlock before the goto, but the goto also unlocks so it's a double unlock.
There's also the case where there's an unlock without a previous lock. I've just sent out a different version of the patch that fixes that as well:
Thanks.
Quoted 30 lines
Fixes 5646ffa863d0 ("btrfs: make send work with concurrent block group relocation")Signed-off-by Dan Carpenter <[email protected]>--- fs/btrfs/send.c | 2 -- 1 file changed, 2 deletions(-)fs/btrfs/send.c +0
-2@@ -7152,7 +7152,6 @@ static int btrfs_compare_trees(struct btrfs_root *left_root, left_path->nodes[left_level] =btrfs_clone_extent_buffer (left_root->commit_root);if (!left_path->nodes[left_level]) { -up_read (&fs_info->commit_root_sem); ret = -ENOMEM ; goto out; }@@ -7162,7 +7161,6 @@ static int btrfs_compare_trees(struct btrfs_root *left_root, right_path->nodes[right_level] =btrfs_clone_extent_buffer (right_root->commit_root);if (!right_path->nodes[right_level]) { -up_read (&fs_info->commit_root_sem); ret = -ENOMEM ; goto out; }Signature · 1 line
2.20.1
Quoted 8 lines · Filipe Manana
Quoted 2 lines · Dan Carpenter
These error paths unlock before the goto, but the goto also unlocks so it's a double unlock.
There's also the case where there's an unlock without a previous lock. I've just sent out a different version of the patch that fixes that as well:
Ah! Thanks.
regards,
dan carpenter