Commit 201bb5d7 authored Aug 22, 2022 by Filipe Manana Committed by Greg Kroah-Hartman Sep 05, 2022

btrfs: fix silent failure when deleting root reference



commit 47bf225a8d2cccb15f7e8d4a1ed9b757dd86afd7 upstream.

At btrfs_del_root_ref(), if btrfs_search_slot() returns an error, we end
up returning from the function with a value of 0 (success). This happens
because the function returns the value stored in the variable 'err',
which is 0, while the error value we got from btrfs_search_slot() is
stored in the 'ret' variable.

So fix it by setting 'err' with the error value.

Fixes: 8289ed9f93bef2 ("btrfs: replace the BUG_ON in btrfs_del_root_ref with proper error handling")
CC: stable@vger.kernel.org # 5.16+
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 571a13b3

fs/btrfs/root-tree.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -371,9 +371,10 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id,
		key.offset = ref_id;
		again:
		ret = btrfs_search_slot(trans, tree_root, &key, path, -1, 1);
		if (ret < 0)
		if (ret < 0) {
		err = ret;
		goto out;
		if (ret == 0) {
		} else if (ret == 0) {
		leaf = path->nodes[0];
		ref = btrfs_item_ptr(leaf, path->slots[0],
		struct btrfs_root_ref);