btrfs: qgroup race fix and cleanup
cover btrfs: qgroup race fix and cleanup
From: Filipe Manana <[email protected]>
Fix a race that leads to a use-after-free plus cleanup no longer used qgroup_ulist.
Filipe Manana (2):
btrfs: qgroup: fix race between quota disable and quota rescan ioctl
btrfs: qgroup: remove no longer used fs_info->qgroup_ulist
fs/btrfs/disk-io.c | 1 - fs/btrfs/fs.h | 6 ------ fs/btrfs/qgroup.c | 53 +++++++++++++++------------------------------- 3 files changed, 17 insertions(+), 43 deletions(-)
Signature · 1 line
2.47.2
PATCH 1/2 btrfs: qgroup: fix race between quota disable and quota rescan ioctl
From: Filipe Manana <[email protected]>
There's a race between a task disabling quotas and another running the rescan ioctl that can result in a use-after-free of qgroup records from the fs_info->qgroup_tree rbtree.
This happens as follows:
1) Task A enters btrfs_ioctl_quota_rescan() -> btrfs_qgroup_rescan();
2) Task B enters btrfs_quota_disable() and calls btrfs_qgroup_wait_for_completion(), which does nothing because at that point fs_info->qgroup_rescan_running is false (it wasn't set yet by task A);
3) Task B calls btrfs_free_qgroup_config() which starts freeing qgroups from fs_info->qgroup_tree without taking the lock fs_info->qgroup_lock;
4) Task A enters qgroup_rescan_zero_tracking() which starts iterating the fs_info->qgroup_tree tree while holding fs_info->qgroup_lock, but task B is freeing qgroup records from that tree without holding the lock, resulting in a use-after-free.
Fix this by taking fs_info->qgroup_lock at btrfs_free_qgroup_config(). Also at btrfs_qgroup_rescan() don't start the rescan worker if quotas were already disabled.
--- fs/btrfs/qgroup.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
fs/btrfs/qgroup.c +16 -6
@@ -636,22 +636,30 @@ bool btrfs_check_quota_leak(const struct btrfs_fs_info *fs_info)/* * This is called from close_ctree() or open_ctree() or btrfs_quota_disable(), -* first two are in single-threaded paths.And for the third one, we have set -* quota_root to be null with qgroup_lock held before, so it is safe to clean -* up the in-memory structures without qgroup_lock held. +* first two are in single-threaded paths. */ void btrfs_free_qgroup_config (struct btrfs_fs_info *fs_info) {struct rb_node *n;struct btrfs_qgroup *qgroup; +/* +* btrfs_quota_disable() can be called concurrently with +* btrfs_qgroup_rescan() -> qgroup_rescan_zero_tracking(), so take the +* lock. +*/ +spin_lock (&fs_info->qgroup_lock);while ((n =rb_first (&fs_info->qgroup_tree))) { qgroup = rb_entry(n, struct btrfs_qgroup, node);rb_erase (n, &fs_info->qgroup_tree);__del_qgroup_rb (qgroup); +spin_unlock (&fs_info->qgroup_lock);btrfs_sysfs_del_one_qgroup (fs_info, qgroup);kfree (qgroup); +spin_lock (&fs_info->qgroup_lock); } +spin_unlock (&fs_info->qgroup_lock); +/* * We call btrfs_free_qgroup_config() when unmounting * filesystem and disabling quota, so we set qgroup_ulist
@@ -4036,9 +4044,11 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info)qgroup_rescan_zero_tracking (fs_info);mutex_lock (&fs_info->qgroup_rescan_lock); - fs_info->qgroup_rescan_running = true; -btrfs_queue_work (fs_info->qgroup_rescan_workers, - &fs_info->qgroup_rescan_work); +if (test_bit (BTRFS_FS_QUOTA_ENABLED , &fs_info->flags)) { + fs_info->qgroup_rescan_running = true; +btrfs_queue_work (fs_info->qgroup_rescan_workers, + &fs_info->qgroup_rescan_work); + }mutex_unlock (&fs_info->qgroup_rescan_lock);return 0 ;
Signature · 1 line
2.47.2
PATCH 2/2 btrfs: qgroup: remove no longer used fs_info->qgroup_ulist
In reply to [email protected]From: Filipe Manana <[email protected]>
It's not used anymore after commit 091344508249 ("btrfs: qgroup: use qgroup_iterator in qgroup_convert_meta()"), so remove it.
--- fs/btrfs/disk-io.c | 1 - fs/btrfs/fs.h | 6 ------ fs/btrfs/qgroup.c | 31 +------------------------------ 3 files changed, 1 insertion(+), 37 deletions(-)
fs/btrfs/disk-io.c +0 -1
@@ -1947,7 +1947,6 @@ static void btrfs_init_qgroup(struct btrfs_fs_info *fs_info) fs_info->qgroup_tree =RB_ROOT ;INIT_LIST_HEAD (&fs_info->dirty_qgroups); fs_info->qgroup_seq =1 ; - fs_info->qgroup_ulist =NULL ; fs_info->qgroup_rescan_running = false; fs_info->qgroup_drop_subtree_thres =BTRFS_QGROUP_DROP_SUBTREE_THRES_DEFAULT ;mutex_init (&fs_info->qgroup_rescan_lock);
fs/btrfs/fs.h +0 -6
@@ -740,12 +740,6 @@ struct btrfs_fs_info {struct rb_root qgroup_tree;spinlock_t qgroup_lock; -/* -* Used to avoid frequently calling ulist_alloc()/ulist_free() -* when doing qgroup accounting, it must be protected by qgroup_lock. -*/ -struct ulist *qgroup_ulist; -/* * Protect user change for quota operations. If a transaction is needed, * it must be started before locking this lock.
fs/btrfs/qgroup.c +1 -30
@@ -397,12 +397,6 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)if (!fs_info->quota_root)return 0 ; - fs_info->qgroup_ulist =ulist_alloc (GFP_KERNEL ); -if (!fs_info->qgroup_ulist) { - ret = -ENOMEM ; - goto out; - } - path =btrfs_alloc_path ();if (!path) { ret = -ENOMEM ;
@@ -587,8 +581,6 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)if (fs_info->qgroup_flags &BTRFS_QGROUP_STATUS_FLAG_RESCAN ) ret =qgroup_rescan_init (fs_info, rescan_progress,0 ); }else { -ulist_free (fs_info->qgroup_ulist); - fs_info->qgroup_ulist =NULL ; fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN ;btrfs_sysfs_del_qgroups (fs_info); }
@@ -660,13 +652,6 @@ void btrfs_free_qgroup_config(struct btrfs_fs_info *fs_info) }spin_unlock (&fs_info->qgroup_lock); -/* -* We call btrfs_free_qgroup_config() when unmounting -* filesystem and disabling quota, so we set qgroup_ulist -* to be null here to avoid double free. -*/ -ulist_free (fs_info->qgroup_ulist); - fs_info->qgroup_ulist =NULL ;btrfs_sysfs_del_qgroups (fs_info); }
@@ -1012,7 +997,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,struct btrfs_qgroup *qgroup =NULL ;struct btrfs_qgroup *prealloc =NULL ;struct btrfs_trans_handle *trans =NULL ; -struct ulist *ulist =NULL ;const bool simple = (quota_ctl_args->cmd ==BTRFS_QUOTA_CTL_ENABLE_SIMPLE_QUOTA );int ret =0 ;int slot;
@@ -1035,12 +1019,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,if (fs_info->quota_root) goto out; - ulist =ulist_alloc (GFP_KERNEL ); -if (!ulist) { - ret = -ENOMEM ; - goto out; - } - ret =btrfs_sysfs_add_qgroups (fs_info);if (ret <0 ) goto out;
@@ -1080,9 +1058,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,if (fs_info->quota_root) goto out; - fs_info->qgroup_ulist = ulist; - ulist =NULL ; -/* * initially create the quota tree */
@@ -1281,17 +1256,13 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,if (ret)btrfs_put_root (quota_root); out: -if (ret) { -ulist_free (fs_info->qgroup_ulist); - fs_info->qgroup_ulist =NULL ; +if (ret)btrfs_sysfs_del_qgroups (fs_info); - }mutex_unlock (&fs_info->qgroup_ioctl_lock);if (ret && trans)btrfs_end_transaction (trans);else if (trans) ret =btrfs_end_transaction (trans); -ulist_free (ulist);kfree (prealloc);return ret; }
Signature · 1 line
2.47.2
v2 cover btrfs: qgroup race fix and cleanup
In reply to [email protected]From: Filipe Manana <[email protected]>
Fix a race that leads to a use-after-free plus cleanup no longer used qgroup_ulist.
V2: Update patch 1/2 to return -ENOTCONN if quotas are disabled when
we try to start the rescan worker.
Filipe Manana (2):
btrfs: qgroup: fix race between quota disable and quota rescan ioctl
btrfs: qgroup: remove no longer used fs_info->qgroup_ulist
fs/btrfs/disk-io.c | 1 - fs/btrfs/fs.h | 6 ----- fs/btrfs/qgroup.c | 55 ++++++++++++++++------------------------------ 3 files changed, 19 insertions(+), 43 deletions(-)
Signature · 1 line
2.47.2
PATCH v2 1/2 btrfs: qgroup: fix race between quota disable and quota rescan ioctl
From: Filipe Manana <[email protected]>
There's a race between a task disabling quotas and another running the rescan ioctl that can result in a use-after-free of qgroup records from the fs_info->qgroup_tree rbtree.
This happens as follows:
1) Task A enters btrfs_ioctl_quota_rescan() -> btrfs_qgroup_rescan();
2) Task B enters btrfs_quota_disable() and calls btrfs_qgroup_wait_for_completion(), which does nothing because at that point fs_info->qgroup_rescan_running is false (it wasn't set yet by task A);
3) Task B calls btrfs_free_qgroup_config() which starts freeing qgroups from fs_info->qgroup_tree without taking the lock fs_info->qgroup_lock;
4) Task A enters qgroup_rescan_zero_tracking() which starts iterating the fs_info->qgroup_tree tree while holding fs_info->qgroup_lock, but task B is freeing qgroup records from that tree without holding the lock, resulting in a use-after-free.
Fix this by taking fs_info->qgroup_lock at btrfs_free_qgroup_config(). Also at btrfs_qgroup_rescan() don't start the rescan worker if quotas were already disabled.
--- fs/btrfs/qgroup.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
fs/btrfs/qgroup.c +18 -6
@@ -636,22 +636,30 @@ bool btrfs_check_quota_leak(const struct btrfs_fs_info *fs_info)/* * This is called from close_ctree() or open_ctree() or btrfs_quota_disable(), -* first two are in single-threaded paths.And for the third one, we have set -* quota_root to be null with qgroup_lock held before, so it is safe to clean -* up the in-memory structures without qgroup_lock held. +* first two are in single-threaded paths. */ void btrfs_free_qgroup_config (struct btrfs_fs_info *fs_info) {struct rb_node *n;struct btrfs_qgroup *qgroup; +/* +* btrfs_quota_disable() can be called concurrently with +* btrfs_qgroup_rescan() -> qgroup_rescan_zero_tracking(), so take the +* lock. +*/ +spin_lock (&fs_info->qgroup_lock);while ((n =rb_first (&fs_info->qgroup_tree))) { qgroup = rb_entry(n, struct btrfs_qgroup, node);rb_erase (n, &fs_info->qgroup_tree);__del_qgroup_rb (qgroup); +spin_unlock (&fs_info->qgroup_lock);btrfs_sysfs_del_one_qgroup (fs_info, qgroup);kfree (qgroup); +spin_lock (&fs_info->qgroup_lock); } +spin_unlock (&fs_info->qgroup_lock); +/* * We call btrfs_free_qgroup_config() when unmounting * filesystem and disabling quota, so we set qgroup_ulist
@@ -4036,9 +4044,13 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info)qgroup_rescan_zero_tracking (fs_info);mutex_lock (&fs_info->qgroup_rescan_lock); - fs_info->qgroup_rescan_running = true; -btrfs_queue_work (fs_info->qgroup_rescan_workers, - &fs_info->qgroup_rescan_work); +if (test_bit (BTRFS_FS_QUOTA_ENABLED , &fs_info->flags)) { + fs_info->qgroup_rescan_running = true; +btrfs_queue_work (fs_info->qgroup_rescan_workers, + &fs_info->qgroup_rescan_work); + }else { + ret = -ENOTCONN ; + }mutex_unlock (&fs_info->qgroup_rescan_lock);return 0 ;
Signature · 1 line
2.47.2
PATCH v2 2/2 btrfs: qgroup: remove no longer used fs_info->qgroup_ulist
In reply to [email protected]From: Filipe Manana <[email protected]>
It's not used anymore after commit 091344508249 ("btrfs: qgroup: use qgroup_iterator in qgroup_convert_meta()"), so remove it.
--- fs/btrfs/disk-io.c | 1 - fs/btrfs/fs.h | 6 ------ fs/btrfs/qgroup.c | 31 +------------------------------ 3 files changed, 1 insertion(+), 37 deletions(-)
fs/btrfs/disk-io.c +0 -1
@@ -1947,7 +1947,6 @@ static void btrfs_init_qgroup(struct btrfs_fs_info *fs_info) fs_info->qgroup_tree =RB_ROOT ;INIT_LIST_HEAD (&fs_info->dirty_qgroups); fs_info->qgroup_seq =1 ; - fs_info->qgroup_ulist =NULL ; fs_info->qgroup_rescan_running = false; fs_info->qgroup_drop_subtree_thres =BTRFS_QGROUP_DROP_SUBTREE_THRES_DEFAULT ;mutex_init (&fs_info->qgroup_rescan_lock);
fs/btrfs/fs.h +0 -6
@@ -740,12 +740,6 @@ struct btrfs_fs_info {struct rb_root qgroup_tree;spinlock_t qgroup_lock; -/* -* Used to avoid frequently calling ulist_alloc()/ulist_free() -* when doing qgroup accounting, it must be protected by qgroup_lock. -*/ -struct ulist *qgroup_ulist; -/* * Protect user change for quota operations. If a transaction is needed, * it must be started before locking this lock.
fs/btrfs/qgroup.c +1 -30
@@ -397,12 +397,6 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)if (!fs_info->quota_root)return 0 ; - fs_info->qgroup_ulist =ulist_alloc (GFP_KERNEL ); -if (!fs_info->qgroup_ulist) { - ret = -ENOMEM ; - goto out; - } - path =btrfs_alloc_path ();if (!path) { ret = -ENOMEM ;
@@ -587,8 +581,6 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)if (fs_info->qgroup_flags &BTRFS_QGROUP_STATUS_FLAG_RESCAN ) ret =qgroup_rescan_init (fs_info, rescan_progress,0 ); }else { -ulist_free (fs_info->qgroup_ulist); - fs_info->qgroup_ulist =NULL ; fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN ;btrfs_sysfs_del_qgroups (fs_info); }
@@ -660,13 +652,6 @@ void btrfs_free_qgroup_config(struct btrfs_fs_info *fs_info) }spin_unlock (&fs_info->qgroup_lock); -/* -* We call btrfs_free_qgroup_config() when unmounting -* filesystem and disabling quota, so we set qgroup_ulist -* to be null here to avoid double free. -*/ -ulist_free (fs_info->qgroup_ulist); - fs_info->qgroup_ulist =NULL ;btrfs_sysfs_del_qgroups (fs_info); }
@@ -1012,7 +997,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,struct btrfs_qgroup *qgroup =NULL ;struct btrfs_qgroup *prealloc =NULL ;struct btrfs_trans_handle *trans =NULL ; -struct ulist *ulist =NULL ;const bool simple = (quota_ctl_args->cmd ==BTRFS_QUOTA_CTL_ENABLE_SIMPLE_QUOTA );int ret =0 ;int slot;
@@ -1035,12 +1019,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,if (fs_info->quota_root) goto out; - ulist =ulist_alloc (GFP_KERNEL ); -if (!ulist) { - ret = -ENOMEM ; - goto out; - } - ret =btrfs_sysfs_add_qgroups (fs_info);if (ret <0 ) goto out;
@@ -1080,9 +1058,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,if (fs_info->quota_root) goto out; - fs_info->qgroup_ulist = ulist; - ulist =NULL ; -/* * initially create the quota tree */
@@ -1281,17 +1256,13 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,if (ret)btrfs_put_root (quota_root); out: -if (ret) { -ulist_free (fs_info->qgroup_ulist); - fs_info->qgroup_ulist =NULL ; +if (ret)btrfs_sysfs_del_qgroups (fs_info); - }mutex_unlock (&fs_info->qgroup_ioctl_lock);if (ret && trans)btrfs_end_transaction (trans);else if (trans) ret =btrfs_end_transaction (trans); -ulist_free (ulist);kfree (prealloc);return ret; }
Signature · 1 line
2.47.2
v3 cover btrfs: qgroup race fix and cleanup
In reply to [email protected]From: Filipe Manana <[email protected]>
Fix a race that leads to a use-after-free plus cleanup no longer used qgroup_ulist.
V2: Update patch 1/2 to return -ENOTCONN if quotas are disabled when
we try to start the rescan worker.
V3: Make patch 1/2 actually return -ENOTCONN.
Filipe Manana (2):
btrfs: qgroup: fix race between quota disable and quota rescan ioctl
btrfs: qgroup: remove no longer used fs_info->qgroup_ulist
fs/btrfs/disk-io.c | 1 - fs/btrfs/fs.h | 6 ----- fs/btrfs/qgroup.c | 57 ++++++++++++++++------------------------------ 3 files changed, 20 insertions(+), 44 deletions(-)
Signature · 1 line
2.47.2
PATCH v3 1/2 btrfs: qgroup: fix race between quota disable and quota rescan ioctl
From: Filipe Manana <[email protected]>
There's a race between a task disabling quotas and another running the rescan ioctl that can result in a use-after-free of qgroup records from the fs_info->qgroup_tree rbtree.
This happens as follows:
1) Task A enters btrfs_ioctl_quota_rescan() -> btrfs_qgroup_rescan();
2) Task B enters btrfs_quota_disable() and calls btrfs_qgroup_wait_for_completion(), which does nothing because at that point fs_info->qgroup_rescan_running is false (it wasn't set yet by task A);
3) Task B calls btrfs_free_qgroup_config() which starts freeing qgroups from fs_info->qgroup_tree without taking the lock fs_info->qgroup_lock;
4) Task A enters qgroup_rescan_zero_tracking() which starts iterating the fs_info->qgroup_tree tree while holding fs_info->qgroup_lock, but task B is freeing qgroup records from that tree without holding the lock, resulting in a use-after-free.
Fix this by taking fs_info->qgroup_lock at btrfs_free_qgroup_config(). Also at btrfs_qgroup_rescan() don't start the rescan worker if quotas were already disabled.
--- fs/btrfs/qgroup.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)
fs/btrfs/qgroup.c +19 -7
@@ -636,22 +636,30 @@ bool btrfs_check_quota_leak(const struct btrfs_fs_info *fs_info)/* * This is called from close_ctree() or open_ctree() or btrfs_quota_disable(), -* first two are in single-threaded paths.And for the third one, we have set -* quota_root to be null with qgroup_lock held before, so it is safe to clean -* up the in-memory structures without qgroup_lock held. +* first two are in single-threaded paths. */ void btrfs_free_qgroup_config (struct btrfs_fs_info *fs_info) {struct rb_node *n;struct btrfs_qgroup *qgroup; +/* +* btrfs_quota_disable() can be called concurrently with +* btrfs_qgroup_rescan() -> qgroup_rescan_zero_tracking(), so take the +* lock. +*/ +spin_lock (&fs_info->qgroup_lock);while ((n =rb_first (&fs_info->qgroup_tree))) { qgroup = rb_entry(n, struct btrfs_qgroup, node);rb_erase (n, &fs_info->qgroup_tree);__del_qgroup_rb (qgroup); +spin_unlock (&fs_info->qgroup_lock);btrfs_sysfs_del_one_qgroup (fs_info, qgroup);kfree (qgroup); +spin_lock (&fs_info->qgroup_lock); } +spin_unlock (&fs_info->qgroup_lock); +/* * We call btrfs_free_qgroup_config() when unmounting * filesystem and disabling quota, so we set qgroup_ulist
@@ -4036,12 +4044,16 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info)qgroup_rescan_zero_tracking (fs_info);mutex_lock (&fs_info->qgroup_rescan_lock); - fs_info->qgroup_rescan_running = true; -btrfs_queue_work (fs_info->qgroup_rescan_workers, - &fs_info->qgroup_rescan_work); +if (test_bit (BTRFS_FS_QUOTA_ENABLED , &fs_info->flags)) { + fs_info->qgroup_rescan_running = true; +btrfs_queue_work (fs_info->qgroup_rescan_workers, + &fs_info->qgroup_rescan_work); + }else { + ret = -ENOTCONN ; + }mutex_unlock (&fs_info->qgroup_rescan_lock); -return 0 ; +return ret; } int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info,
Signature · 1 line
2.47.2
PATCH v3 2/2 btrfs: qgroup: remove no longer used fs_info->qgroup_ulist
In reply to [email protected]From: Filipe Manana <[email protected]>
It's not used anymore after commit 091344508249 ("btrfs: qgroup: use qgroup_iterator in qgroup_convert_meta()"), so remove it.
--- fs/btrfs/disk-io.c | 1 - fs/btrfs/fs.h | 6 ------ fs/btrfs/qgroup.c | 31 +------------------------------ 3 files changed, 1 insertion(+), 37 deletions(-)
fs/btrfs/disk-io.c +0 -1
@@ -1947,7 +1947,6 @@ static void btrfs_init_qgroup(struct btrfs_fs_info *fs_info) fs_info->qgroup_tree =RB_ROOT ;INIT_LIST_HEAD (&fs_info->dirty_qgroups); fs_info->qgroup_seq =1 ; - fs_info->qgroup_ulist =NULL ; fs_info->qgroup_rescan_running = false; fs_info->qgroup_drop_subtree_thres =BTRFS_QGROUP_DROP_SUBTREE_THRES_DEFAULT ;mutex_init (&fs_info->qgroup_rescan_lock);
fs/btrfs/fs.h +0 -6
@@ -740,12 +740,6 @@ struct btrfs_fs_info {struct rb_root qgroup_tree;spinlock_t qgroup_lock; -/* -* Used to avoid frequently calling ulist_alloc()/ulist_free() -* when doing qgroup accounting, it must be protected by qgroup_lock. -*/ -struct ulist *qgroup_ulist; -/* * Protect user change for quota operations. If a transaction is needed, * it must be started before locking this lock.
fs/btrfs/qgroup.c +1 -30
@@ -397,12 +397,6 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)if (!fs_info->quota_root)return 0 ; - fs_info->qgroup_ulist =ulist_alloc (GFP_KERNEL ); -if (!fs_info->qgroup_ulist) { - ret = -ENOMEM ; - goto out; - } - path =btrfs_alloc_path ();if (!path) { ret = -ENOMEM ;
@@ -587,8 +581,6 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)if (fs_info->qgroup_flags &BTRFS_QGROUP_STATUS_FLAG_RESCAN ) ret =qgroup_rescan_init (fs_info, rescan_progress,0 ); }else { -ulist_free (fs_info->qgroup_ulist); - fs_info->qgroup_ulist =NULL ; fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN ;btrfs_sysfs_del_qgroups (fs_info); }
@@ -660,13 +652,6 @@ void btrfs_free_qgroup_config(struct btrfs_fs_info *fs_info) }spin_unlock (&fs_info->qgroup_lock); -/* -* We call btrfs_free_qgroup_config() when unmounting -* filesystem and disabling quota, so we set qgroup_ulist -* to be null here to avoid double free. -*/ -ulist_free (fs_info->qgroup_ulist); - fs_info->qgroup_ulist =NULL ;btrfs_sysfs_del_qgroups (fs_info); }
@@ -1012,7 +997,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,struct btrfs_qgroup *qgroup =NULL ;struct btrfs_qgroup *prealloc =NULL ;struct btrfs_trans_handle *trans =NULL ; -struct ulist *ulist =NULL ;const bool simple = (quota_ctl_args->cmd ==BTRFS_QUOTA_CTL_ENABLE_SIMPLE_QUOTA );int ret =0 ;int slot;
@@ -1035,12 +1019,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,if (fs_info->quota_root) goto out; - ulist =ulist_alloc (GFP_KERNEL ); -if (!ulist) { - ret = -ENOMEM ; - goto out; - } - ret =btrfs_sysfs_add_qgroups (fs_info);if (ret <0 ) goto out;
@@ -1080,9 +1058,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,if (fs_info->quota_root) goto out; - fs_info->qgroup_ulist = ulist; - ulist =NULL ; -/* * initially create the quota tree */
@@ -1281,17 +1256,13 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,if (ret)btrfs_put_root (quota_root); out: -if (ret) { -ulist_free (fs_info->qgroup_ulist); - fs_info->qgroup_ulist =NULL ; +if (ret)btrfs_sysfs_del_qgroups (fs_info); - }mutex_unlock (&fs_info->qgroup_ioctl_lock);if (ret && trans)btrfs_end_transaction (trans);else if (trans) ret =btrfs_end_transaction (trans); -ulist_free (ulist);kfree (prealloc);return ret; }
Signature · 1 line
2.47.2
Re: [PATCH v3 1/2] btrfs: qgroup: fix race between quota disable and quota rescan ioctl
In reply to [email protected]Quoted 23 lines · On Mon, Jun 30, 2025 at 02:07:47PM +0100, [email protected] wrote:
From: Filipe Manana <[email protected]>
There's a race between a task disabling quotas and another running the rescan ioctl that can result in a use-after-free of qgroup records from the
fs_info->qgroup_treerbtree.This happens as follows:
1) Task A enters
btrfs_ioctl_quota_rescan()->btrfs_qgroup_rescan();2) Task B enters
btrfs_quota_disable()and callsbtrfs_qgroup_wait_for_completion(), which does nothing because at that pointfs_info->qgroup_rescan_runningis false (it wasn't set yet by task A);3) Task B calls
btrfs_free_qgroup_config()which starts freeing qgroups fromfs_info->qgroup_treewithout taking the lockfs_info->qgroup_lock;4) Task A enters
qgroup_rescan_zero_tracking()which starts iterating thefs_info->qgroup_treetree while holdingfs_info->qgroup_lock, but task B is freeing qgroup records from that tree without holding the lock, resulting in a use-after-free.
Quoted 7 lines
Fix this by taking
fs_info->qgroup_lockatbtrfs_free_qgroup_config(). Also atbtrfs_qgroup_rescan()don't start the rescan worker if quotas were already disabled.
Quoted 43 lines
--- fs/btrfs/qgroup.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)fs/btrfs/qgroup.c +11
-3@@ -636,22 +636,30 @@ bool btrfs_check_quota_leak(const struct btrfs_fs_info *fs_info)/* * This is called from close_ctree() or open_ctree() or btrfs_quota_disable(), -* first two are in single-threaded paths.And for the third one, we have set -* quota_root to be null with qgroup_lock held before, so it is safe to clean -* up the in-memory structures without qgroup_lock held. +* first two are in single-threaded paths. */ void btrfs_free_qgroup_config (struct btrfs_fs_info *fs_info) {struct rb_node *n;struct btrfs_qgroup *qgroup; +/* +* btrfs_quota_disable() can be called concurrently with +* btrfs_qgroup_rescan() -> qgroup_rescan_zero_tracking(), so take the +* lock. +*/ +spin_lock (&fs_info->qgroup_lock);while ((n =rb_first (&fs_info->qgroup_tree))) { qgroup = rb_entry(n, struct btrfs_qgroup, node);rb_erase (n, &fs_info->qgroup_tree);__del_qgroup_rb (qgroup); +spin_unlock (&fs_info->qgroup_lock);btrfs_sysfs_del_one_qgroup (fs_info, qgroup);kfree (qgroup); +spin_lock (&fs_info->qgroup_lock); } +spin_unlock (&fs_info->qgroup_lock); +/* * We call btrfs_free_qgroup_config() when unmounting * filesystem and disabling quota, so we set qgroup_ulist
fs/btrfs/qgroup.c btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info) · line 4047
Quoted 7 lines
fs/btrfs/qgroup.c +1
-3@@ -4036,12 +4044,16 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info)qgroup_rescan_zero_tracking (fs_info);mutex_lock (&fs_info->qgroup_rescan_lock); - fs_info->qgroup_rescan_running = true; -btrfs_queue_work (fs_info->qgroup_rescan_workers, - &fs_info->qgroup_rescan_work); +if (test_bit (BTRFS_FS_QUOTA_ENABLED , &fs_info->flags)) {
could this be one of the helpers like !btrfs_qgroup_enabled() or maybe even better !btrfs_qgroup_full_accounting()?
Quoted 16 lines
fs/btrfs/qgroup.c +7
-1+ fs_info->qgroup_rescan_running = true; +btrfs_queue_work (fs_info->qgroup_rescan_workers, + &fs_info->qgroup_rescan_work); + }else { + ret = -ENOTCONN ; + }mutex_unlock (&fs_info->qgroup_rescan_lock); -return 0 ; +return ret; } int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info,Signature · 1 line
2.47.2
Re: [PATCH v3 2/2] btrfs: qgroup: remove no longer used fs_info->qgroup_ulist
In reply to [email protected]Quoted 6 lines · On Mon, Jun 30, 2025 at 02:07:48PM +0100, [email protected] wrote:
From: Filipe Manana <[email protected]>
It's not used anymore after commit 091344508249 ("btrfs: qgroup: use
qgroup_iteratorinqgroup_convert_meta()"), so remove it.Signed-off-by Filipe Manana <[email protected]>
Quoted 128 lines
--- fs/btrfs/disk-io.c | 1 - fs/btrfs/fs.h | 6 ------ fs/btrfs/qgroup.c | 31 +------------------------------ 3 files changed, 1 insertion(+), 37 deletions(-)fs/btrfs/disk-io.c +0
-1@@ -1947,7 +1947,6 @@ static void btrfs_init_qgroup(struct btrfs_fs_info *fs_info) fs_info->qgroup_tree =RB_ROOT ;INIT_LIST_HEAD (&fs_info->dirty_qgroups); fs_info->qgroup_seq =1 ; - fs_info->qgroup_ulist =NULL ; fs_info->qgroup_rescan_running = false; fs_info->qgroup_drop_subtree_thres =BTRFS_QGROUP_DROP_SUBTREE_THRES_DEFAULT ;mutex_init (&fs_info->qgroup_rescan_lock);fs/btrfs/fs.h +0
-6@@ -740,12 +740,6 @@ struct btrfs_fs_info {struct rb_root qgroup_tree;spinlock_t qgroup_lock; -/* -* Used to avoid frequently calling ulist_alloc()/ulist_free() -* when doing qgroup accounting, it must be protected by qgroup_lock. -*/ -struct ulist *qgroup_ulist; -/* * Protect user change for quota operations. If a transaction is needed, * it must be started before locking this lock. fs/btrfs/qgroup.c +1
-30@@ -397,12 +397,6 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)if (!fs_info->quota_root)return 0 ; - fs_info->qgroup_ulist =ulist_alloc (GFP_KERNEL ); -if (!fs_info->qgroup_ulist) { - ret = -ENOMEM ; - goto out; - } - path =btrfs_alloc_path ();if (!path) { ret = -ENOMEM ;@@ -587,8 +581,6 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)if (fs_info->qgroup_flags &BTRFS_QGROUP_STATUS_FLAG_RESCAN ) ret =qgroup_rescan_init (fs_info, rescan_progress,0 ); }else { -ulist_free (fs_info->qgroup_ulist); - fs_info->qgroup_ulist =NULL ; fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN ;btrfs_sysfs_del_qgroups (fs_info); }@@ -660,13 +652,6 @@ void btrfs_free_qgroup_config(struct btrfs_fs_info *fs_info) }spin_unlock (&fs_info->qgroup_lock); -/* -* We call btrfs_free_qgroup_config() when unmounting -* filesystem and disabling quota, so we set qgroup_ulist -* to be null here to avoid double free. -*/ -ulist_free (fs_info->qgroup_ulist); - fs_info->qgroup_ulist =NULL ;btrfs_sysfs_del_qgroups (fs_info); }@@ -1012,7 +997,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,struct btrfs_qgroup *qgroup =NULL ;struct btrfs_qgroup *prealloc =NULL ;struct btrfs_trans_handle *trans =NULL ; -struct ulist *ulist =NULL ;const bool simple = (quota_ctl_args->cmd ==BTRFS_QUOTA_CTL_ENABLE_SIMPLE_QUOTA );int ret =0 ;int slot;@@ -1035,12 +1019,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,if (fs_info->quota_root) goto out; - ulist =ulist_alloc (GFP_KERNEL ); -if (!ulist) { - ret = -ENOMEM ; - goto out; - } - ret =btrfs_sysfs_add_qgroups (fs_info);if (ret <0 ) goto out;@@ -1080,9 +1058,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,if (fs_info->quota_root) goto out; - fs_info->qgroup_ulist = ulist; - ulist =NULL ; -/* * initially create the quota tree */ @@ -1281,17 +1256,13 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,if (ret)btrfs_put_root (quota_root); out: -if (ret) { -ulist_free (fs_info->qgroup_ulist); - fs_info->qgroup_ulist =NULL ; +if (ret)btrfs_sysfs_del_qgroups (fs_info); - }mutex_unlock (&fs_info->qgroup_ioctl_lock);if (ret && trans)btrfs_end_transaction (trans);else if (trans) ret =btrfs_end_transaction (trans); -ulist_free (ulist);kfree (prealloc);return ret; }Signature · 1 line
2.47.2
Re: [PATCH v3 1/2] btrfs: qgroup: fix race between quota disable and quota rescan ioctl
In reply to Boris BurkovQuoted 80 lines · Boris Burkov
Quoted 23 lines · On Mon, Jun 30, 2025 at 02:07:47PM +0100, [email protected] wrote:
From: Filipe Manana <[email protected]>
There's a race between a task disabling quotas and another running the rescan ioctl that can result in a use-after-free of qgroup records from the
fs_info->qgroup_treerbtree.This happens as follows:
1) Task A enters
btrfs_ioctl_quota_rescan()->btrfs_qgroup_rescan();2) Task B enters
btrfs_quota_disable()and callsbtrfs_qgroup_wait_for_completion(), which does nothing because at that pointfs_info->qgroup_rescan_runningis false (it wasn't set yet by task A);3) Task B calls
btrfs_free_qgroup_config()which starts freeing qgroups fromfs_info->qgroup_treewithout taking the lockfs_info->qgroup_lock;4) Task A enters
qgroup_rescan_zero_tracking()which starts iterating thefs_info->qgroup_treetree while holdingfs_info->qgroup_lock, but task B is freeing qgroup records from that tree without holding the lock, resulting in a use-after-free.Quoted 7 lines
Fix this by taking
fs_info->qgroup_lockatbtrfs_free_qgroup_config(). Also atbtrfs_qgroup_rescan()don't start the rescan worker if quotas were already disabled.Reviewed-by Boris Burkov <[email protected]>Quoted 45 lines
--- fs/btrfs/qgroup.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)fs/btrfs/qgroup.c +11
-3@@ -636,22 +636,30 @@ bool btrfs_check_quota_leak(const struct btrfs_fs_info *fs_info)/* * This is called from close_ctree() or open_ctree() or btrfs_quota_disable(), -* first two are in single-threaded paths.And for the third one, we have set -* quota_root to be null with qgroup_lock held before, so it is safe to clean -* up the in-memory structures without qgroup_lock held. +* first two are in single-threaded paths. */ void btrfs_free_qgroup_config (struct btrfs_fs_info *fs_info) {struct rb_node *n;struct btrfs_qgroup *qgroup; +/* +* btrfs_quota_disable() can be called concurrently with +* btrfs_qgroup_rescan() -> qgroup_rescan_zero_tracking(), so take the +* lock. +*/ +spin_lock (&fs_info->qgroup_lock);while ((n =rb_first (&fs_info->qgroup_tree))) { qgroup = rb_entry(n, struct btrfs_qgroup, node);rb_erase (n, &fs_info->qgroup_tree);__del_qgroup_rb (qgroup); +spin_unlock (&fs_info->qgroup_lock);btrfs_sysfs_del_one_qgroup (fs_info, qgroup);kfree (qgroup); +spin_lock (&fs_info->qgroup_lock); } +spin_unlock (&fs_info->qgroup_lock); +/* * We call btrfs_free_qgroup_config() when unmounting * filesystem and disabling quota, so we set qgroup_ulist @@ -4036,12 +4044,16 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info)qgroup_rescan_zero_tracking (fs_info);
Quoted 8 lines
fs/btrfs/qgroup.c btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info) · line 4047
Quoted 5 lines
fs/btrfs/qgroup.c +1
-3mutex_lock (&fs_info->qgroup_rescan_lock); - fs_info->qgroup_rescan_running = true; -btrfs_queue_work (fs_info->qgroup_rescan_workers, - &fs_info->qgroup_rescan_work); +if (test_bit (BTRFS_FS_QUOTA_ENABLED , &fs_info->flags)) {could this be one of the helpers like !btrfs_qgroup_enabled() or maybe even better !btrfs_qgroup_full_accounting()?
Yes, that's fine. I'll update to that when pushing to for-next:
fs/btrfs/qgroup.c +6 -1
@@ -4015,7 +4015,12 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info)qgroup_rescan_zero_tracking (fs_info);mutex_lock (&fs_info->qgroup_rescan_lock); -if (test_bit (BTRFS_FS_QUOTA_ENABLED , &fs_info->flags)) { +/* +* The rescan worker is only for full accounting qgroups, check if it's +* enabled as it is pointless to queue it otherwise. A concurrent quota +* disable may also have just cleared BTRFS_FS_QUOTA_ENABLED. +*/ +if (btrfs_qgroup_full_accounting (fs_info)) { fs_info->qgroup_rescan_running = true;btrfs_queue_work (fs_info->qgroup_rescan_workers, &fs_info->qgroup_rescan_work);
Thanks.
Quoted 17 lines
Quoted 17 lines
fs/btrfs/qgroup.c +7
-2+ fs_info->qgroup_rescan_running = true; +btrfs_queue_work (fs_info->qgroup_rescan_workers, + &fs_info->qgroup_rescan_work); + }else { + ret = -ENOTCONN ; + }mutex_unlock (&fs_info->qgroup_rescan_lock); -return 0 ; +return ret; } int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info, --2.47.2
Re: [PATCH v3 1/2] btrfs: qgroup: fix race between quota disable and quota rescan ioctl
In reply to [email protected]Quoted 23 lines · 在 2025/6/30 22:37, [email protected] 写道:
From: Filipe Manana <[email protected]>
There's a race between a task disabling quotas and another running the rescan ioctl that can result in a use-after-free of qgroup records from the
fs_info->qgroup_treerbtree.This happens as follows:
1) Task A enters
btrfs_ioctl_quota_rescan()->btrfs_qgroup_rescan();2) Task B enters
btrfs_quota_disable()and callsbtrfs_qgroup_wait_for_completion(), which does nothing because at that point fs_info->qgroup_rescan_running is false (it wasn't set yet by task A);3) Task B calls
btrfs_free_qgroup_config()which starts freeing qgroupsfrom fs_info->qgroup_tree without taking the lock fs_info->qgroup_lock;4) Task A enters
qgroup_rescan_zero_tracking()which starts iterating thefs_info->qgroup_treetree while holdingfs_info->qgroup_lock, but task B is freeing qgroup records from that tree without holding the lock, resulting in a use-after-free.
Quoted 7 lines
Fix this by taking
fs_info->qgroup_lockatbtrfs_free_qgroup_config(). Also atbtrfs_qgroup_rescan()don't start the rescan worker if quotas were already disabled.
Thanks,
Qu
Quoted 63 lines
--- fs/btrfs/qgroup.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)fs/btrfs/qgroup.c +19
-7@@ -636,22 +636,30 @@ bool btrfs_check_quota_leak(const struct btrfs_fs_info *fs_info)/* * This is called from close_ctree() or open_ctree() or btrfs_quota_disable(), -* first two are in single-threaded paths.And for the third one, we have set -* quota_root to be null with qgroup_lock held before, so it is safe to clean -* up the in-memory structures without qgroup_lock held. +* first two are in single-threaded paths. */ void btrfs_free_qgroup_config (struct btrfs_fs_info *fs_info) {struct rb_node *n;struct btrfs_qgroup *qgroup; +/* +* btrfs_quota_disable() can be called concurrently with +* btrfs_qgroup_rescan() -> qgroup_rescan_zero_tracking(), so take the +* lock. +*/ +spin_lock (&fs_info->qgroup_lock);while ((n =rb_first (&fs_info->qgroup_tree))) { qgroup = rb_entry(n, struct btrfs_qgroup, node);rb_erase (n, &fs_info->qgroup_tree);__del_qgroup_rb (qgroup); +spin_unlock (&fs_info->qgroup_lock);btrfs_sysfs_del_one_qgroup (fs_info, qgroup);kfree (qgroup); +spin_lock (&fs_info->qgroup_lock); } +spin_unlock (&fs_info->qgroup_lock); +/* * We call btrfs_free_qgroup_config() when unmounting * filesystem and disabling quota, so we set qgroup_ulist @@ -4036,12 +4044,16 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info)qgroup_rescan_zero_tracking (fs_info);mutex_lock (&fs_info->qgroup_rescan_lock); - fs_info->qgroup_rescan_running = true; -btrfs_queue_work (fs_info->qgroup_rescan_workers, - &fs_info->qgroup_rescan_work); +if (test_bit (BTRFS_FS_QUOTA_ENABLED , &fs_info->flags)) { + fs_info->qgroup_rescan_running = true; +btrfs_queue_work (fs_info->qgroup_rescan_workers, + &fs_info->qgroup_rescan_work); + }else { + ret = -ENOTCONN ; + }mutex_unlock (&fs_info->qgroup_rescan_lock); -return 0 ; +return ret; } int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info,
Re: [PATCH v3 2/2] btrfs: qgroup: remove no longer used fs_info->qgroup_ulist
In reply to [email protected]Quoted 6 lines · 在 2025/6/30 22:37, [email protected] 写道:
From: Filipe Manana <[email protected]>
It's not used anymore after commit 091344508249 ("btrfs: qgroup: use
qgroup_iteratorinqgroup_convert_meta()"), so remove it.Signed-off-by Filipe Manana <[email protected]>
Thanks a lot for catching this.
Thanks,
Qu
Quoted 125 lines
--- fs/btrfs/disk-io.c | 1 - fs/btrfs/fs.h | 6 ------ fs/btrfs/qgroup.c | 31 +------------------------------ 3 files changed, 1 insertion(+), 37 deletions(-)fs/btrfs/disk-io.c +0
-1@@ -1947,7 +1947,6 @@ static void btrfs_init_qgroup(struct btrfs_fs_info *fs_info) fs_info->qgroup_tree =RB_ROOT ;INIT_LIST_HEAD (&fs_info->dirty_qgroups); fs_info->qgroup_seq =1 ; - fs_info->qgroup_ulist =NULL ; fs_info->qgroup_rescan_running = false; fs_info->qgroup_drop_subtree_thres =BTRFS_QGROUP_DROP_SUBTREE_THRES_DEFAULT ;mutex_init (&fs_info->qgroup_rescan_lock);fs/btrfs/fs.h +0
-6@@ -740,12 +740,6 @@ struct btrfs_fs_info {struct rb_root qgroup_tree;spinlock_t qgroup_lock; -/* -* Used to avoid frequently calling ulist_alloc()/ulist_free() -* when doing qgroup accounting, it must be protected by qgroup_lock. -*/ -struct ulist *qgroup_ulist; -/* * Protect user change for quota operations. If a transaction is needed, * it must be started before locking this lock. fs/btrfs/qgroup.c +1
-30@@ -397,12 +397,6 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)if (!fs_info->quota_root)return 0 ; - fs_info->qgroup_ulist =ulist_alloc (GFP_KERNEL ); -if (!fs_info->qgroup_ulist) { - ret = -ENOMEM ; - goto out; - } - path =btrfs_alloc_path ();if (!path) { ret = -ENOMEM ;@@ -587,8 +581,6 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)if (fs_info->qgroup_flags &BTRFS_QGROUP_STATUS_FLAG_RESCAN ) ret =qgroup_rescan_init (fs_info, rescan_progress,0 ); }else { -ulist_free (fs_info->qgroup_ulist); - fs_info->qgroup_ulist =NULL ; fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN ;btrfs_sysfs_del_qgroups (fs_info); }@@ -660,13 +652,6 @@ void btrfs_free_qgroup_config(struct btrfs_fs_info *fs_info) }spin_unlock (&fs_info->qgroup_lock); -/* -* We call btrfs_free_qgroup_config() when unmounting -* filesystem and disabling quota, so we set qgroup_ulist -* to be null here to avoid double free. -*/ -ulist_free (fs_info->qgroup_ulist); - fs_info->qgroup_ulist =NULL ;btrfs_sysfs_del_qgroups (fs_info); }@@ -1012,7 +997,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,struct btrfs_qgroup *qgroup =NULL ;struct btrfs_qgroup *prealloc =NULL ;struct btrfs_trans_handle *trans =NULL ; -struct ulist *ulist =NULL ;const bool simple = (quota_ctl_args->cmd ==BTRFS_QUOTA_CTL_ENABLE_SIMPLE_QUOTA );int ret =0 ;int slot;@@ -1035,12 +1019,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,if (fs_info->quota_root) goto out; - ulist =ulist_alloc (GFP_KERNEL ); -if (!ulist) { - ret = -ENOMEM ; - goto out; - } - ret =btrfs_sysfs_add_qgroups (fs_info);if (ret <0 ) goto out;@@ -1080,9 +1058,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,if (fs_info->quota_root) goto out; - fs_info->qgroup_ulist = ulist; - ulist =NULL ; -/* * initially create the quota tree */ @@ -1281,17 +1256,13 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,if (ret)btrfs_put_root (quota_root); out: -if (ret) { -ulist_free (fs_info->qgroup_ulist); - fs_info->qgroup_ulist =NULL ; +if (ret)btrfs_sysfs_del_qgroups (fs_info); - }mutex_unlock (&fs_info->qgroup_ioctl_lock);if (ret && trans)btrfs_end_transaction (trans);else if (trans) ret =btrfs_end_transaction (trans); -ulist_free (ulist);kfree (prealloc);return ret; }