Skip to content

Commit f260c6a

Browse files
shardulsb08kdave
authored andcommitted
btrfs: fix memory leak of qgroup_list in btrfs_add_qgroup_relation
When btrfs_add_qgroup_relation() is called with invalid qgroup levels (src >= dst), the function returns -EINVAL directly without freeing the preallocated qgroup_list structure passed by the caller. This causes a memory leak because the caller unconditionally sets the pointer to NULL after the call, preventing any cleanup. The issue occurs because the level validation check happens before the mutex is acquired and before any error handling path that would free the prealloc pointer. On this early return, the cleanup code at the 'out' label (which includes kfree(prealloc)) is never reached. In btrfs_ioctl_qgroup_assign(), the code pattern is: prealloc = kzalloc(sizeof(*prealloc), GFP_KERNEL); ret = btrfs_add_qgroup_relation(trans, sa->src, sa->dst, prealloc); prealloc = NULL; // Always set to NULL regardless of return value ... kfree(prealloc); // This becomes kfree(NULL), does nothing When the level check fails, 'prealloc' is never freed by either the callee or the caller, resulting in a 64-byte memory leak per failed operation. This can be triggered repeatedly by an unprivileged user with access to a writable btrfs mount, potentially exhausting kernel memory. Fix this by freeing prealloc before the early return, ensuring prealloc is always freed on all error paths. Fixes: 4addc1f ("btrfs: qgroup: preallocate memory before adding a relation") Reviewed-by: Qu Wenruo <[email protected]> Signed-off-by: Shardul Bankar <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 2618849 commit f260c6a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

fs/btrfs/qgroup.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1539,8 +1539,10 @@ int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, u64 src, u64 dst
15391539
ASSERT(prealloc);
15401540

15411541
/* Check the level of src and dst first */
1542-
if (btrfs_qgroup_level(src) >= btrfs_qgroup_level(dst))
1542+
if (btrfs_qgroup_level(src) >= btrfs_qgroup_level(dst)) {
1543+
kfree(prealloc);
15431544
return -EINVAL;
1545+
}
15441546

15451547
mutex_lock(&fs_info->qgroup_ioctl_lock);
15461548
if (!fs_info->quota_root) {

0 commit comments

Comments
 (0)