Commit a3c10895 authored Aug 17, 2014 by Eric Sandeen Committed by Chris Mason Aug 21, 2014

btrfs: fix leak in qgroup_subtree_accounting() error path



Coverity pointed this out; in the newly added
qgroup_subtree_accounting(), if btrfs_find_all_roots()
returns an error, we leak at least the parents pointer,
and possibly the roots pointer, depending on what failure
occurs.

If btrfs_find_all_roots() returns an error, we need to
free up all allocations before we return.  "roots" is
initialized to NULL, so it should be safe to free
it unconditionally (ulist_free() handles that case).

Cc: Mark Fasheh <mfasheh@suse.de>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Mark Fasheh <mfasheh@suse.de>
Signed-off-by: Chris Mason <clm@fb.com>

parent 51f395ad

fs/btrfs/qgroup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1973,7 +1973,7 @@ static int qgroup_subtree_accounting(struct btrfs_trans_handle *trans,
		elem.seq, &roots);
		btrfs_put_tree_mod_seq(fs_info, &elem);
		if (ret < 0)
		return ret;
		goto out;

		if (roots->nnodes != 1)
		goto out;

Admin message