Commit ab3680dd authored May 02, 2015 by Christian Engelmayer Committed by Chris Mason Jun 02, 2015

btrfs: qgroup: Fix possible leak in btrfs_add_qgroup_relation()

Commit 9c8b35b1 ("btrfs: quota: Automatically update related qgroups or
mark INCONSISTENT flags when assigning/deleting a qgroup relations.")
introduced the allocation of a temporary ulist in function
btrfs_add_qgroup_relation() and added the corresponding cleanup to the out
path. However, the allocation was introduced before the src/dst level check
that directly returns. Fix the possible leakage of the ulist by moving the
allocation after the input validation. Detected by Coverity CID 1295988.

Signed-off-by: Christian Engelmayer <cengelma@gmx.at>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>

parent 35c76642

fs/btrfs/qgroup.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1115,14 +1115,14 @@ int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans,
		struct ulist *tmp;
		int ret = 0;

		tmp = ulist_alloc(GFP_NOFS);
		if (!tmp)
		return -ENOMEM;

		/* Check the level of src and dst first */
		if (btrfs_qgroup_level(src) >= btrfs_qgroup_level(dst))
		return -EINVAL;

		tmp = ulist_alloc(GFP_NOFS);
		if (!tmp)
		return -ENOMEM;

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

Admin message