From: Josef Bacik <josef@toxicpanda.com>
Date: Tue, 7 May 2024 18:12:15 +0000 (-0400)
Subject: btrfs: handle errors from btrfs_dec_ref() properly
X-Git-Tag: v6.11-rc1~157^2~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5eb178f373b4f16f3b42d55ff88fc94dd95b93b1;p=thirdparty%2Fkernel%2Flinux.git

btrfs: handle errors from btrfs_dec_ref() properly

In walk_up_proc() we BUG_ON(ret) from btrfs_dec_ref().  This is
incorrect, we have proper error handling here, return the error.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index d1c9158bf3e06..ec3080664bb6b 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5802,7 +5802,10 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
 				ret = btrfs_dec_ref(trans, root, eb, 1);
 			else
 				ret = btrfs_dec_ref(trans, root, eb, 0);
-			BUG_ON(ret); /* -ENOMEM */
+			if (ret) {
+				btrfs_abort_transaction(trans, ret);
+				return ret;
+			}
 			if (is_fstree(btrfs_root_id(root))) {
 				ret = btrfs_qgroup_trace_leaf_items(trans, eb);
 				if (ret) {