From: fdmanana@kernel.org
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v2 3/6] btrfs: qgroup: fix leak of qgroups in rb tree after failure to enable quotas
Date: Sat, 3 Oct 2026 18:00:02 +0100 [thread overview]
Message-ID: <2435981dcde450de7ffedc604e39168c19c2c4ab.1791046651.git.fdmanana@suse.com> (raw)
In-Reply-To: <cover.1791046651.git.fdmanana@suse.com>
From: Filipe Manana <fdmanana@suse.com>
When enabling quotas we add struct btrfs_qroup items to the rbtree
fs_info->qgroup_tree, however if there's an error during the quota enable
operation after adding those items, we exit without removing the items
from the rbtree and freeing them.
Fix this by calling btrfs_free_qgroup_config() on error, which also
deletes all sysfs entries (it calls btrfs_sysfs_del_qgroups()).
Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
fs/btrfs/qgroup.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 4b6c82a24bc5..9f21b091c545 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1293,8 +1293,13 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,
if (ret)
btrfs_put_root(quota_root);
out:
- if (ret)
- btrfs_sysfs_del_qgroups(fs_info);
+ if (ret) {
+ /*
+ * Free all qgroups previously added with add_qgroup_rb() and
+ * sysfs entries.
+ */
+ btrfs_free_qgroup_config(fs_info);
+ }
mutex_unlock(&fs_info->qgroup_ioctl_lock);
if (ret && trans)
btrfs_end_transaction(trans);
--
2.47.2
next prev parent reply other threads:[~2026-10-03 17:00 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-02 18:55 [PATCH 0/6] btrfs: some qgroup fixes and cleanups fdmanana
2026-10-02 18:55 ` [PATCH] btrfs: qgroup: fix race between subvolume creation and adding/removing relations fdmanana
2026-10-02 18:58 ` Filipe Manana
2026-10-02 18:55 ` [PATCH 1/6] btrfs: qgroup: fix swapped blocks existence check when tracing after COW fdmanana
2026-10-03 0:18 ` Qu Wenruo
2026-10-02 18:55 ` [PATCH 2/6] btrfs: qgroup: abort transaction on failure to add qgroup relation fdmanana
2026-10-03 0:19 ` Qu Wenruo
2026-10-02 18:55 ` [PATCH 3/6] btrfs: qgroup: fix leak of qgroups in rb tree after failure to enable quotas fdmanana
2026-10-02 18:55 ` [PATCH 4/6] btrfs: qgroup: merge error labels in btrfs_quota_enable() fdmanana
2026-10-03 0:22 ` Qu Wenruo
2026-10-02 18:55 ` [PATCH 5/6] btrfs: abort transaction on qgroup failures in create_pending_snapshot() fdmanana
2026-10-03 0:22 ` Qu Wenruo
2026-10-02 18:55 ` [PATCH 6/6] btrfs: qgroup: fix off-by-one max level check in qgroup_trace_new_subtree_blocks() fdmanana
2026-10-03 16:59 ` [PATCH v2 0/6] btrfs: some qgroup fixes and cleanups fdmanana
2026-10-03 17:00 ` [PATCH v2 1/6] btrfs: qgroup: fix swapped blocks existence check when tracing after COW fdmanana
2026-10-03 21:29 ` Qu Wenruo
2026-10-03 17:00 ` [PATCH v2 2/6] btrfs: qgroup: abort transaction on failure to add qgroup relation fdmanana
2026-10-03 17:00 ` fdmanana [this message]
2026-10-03 21:35 ` [PATCH v2 3/6] btrfs: qgroup: fix leak of qgroups in rb tree after failure to enable quotas Qu Wenruo
2026-10-03 17:00 ` [PATCH v2 4/6] btrfs: qgroup: merge error labels in btrfs_quota_enable() fdmanana
2026-10-03 17:00 ` [PATCH v2 5/6] btrfs: abort transaction on qgroup failures in create_pending_snapshot() fdmanana
2026-10-03 17:00 ` [PATCH v2 6/6] btrfs: qgroup: fix off-by-one max level check in qgroup_trace_new_subtree_blocks() fdmanana
2026-10-03 21:36 ` Qu Wenruo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2435981dcde450de7ffedc604e39168c19c2c4ab.1791046651.git.fdmanana@suse.com \
--to=fdmanana@kernel.org \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox