summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2014-06-12 00:14:59 -0500
committerChris Mason <clm@fb.com>2014-06-13 09:52:26 -0700
commitd737278091fccda77f6896012ba86c5ffb57993f (patch)
tree41ccc9192cceeeaa0a8694b6c6d3a7e7fd71c43a /fs
parentb050f9f6ddefe5de9c130fda6493ccaacd5168ba (diff)
downloadlinux-d737278091fccda77f6896012ba86c5ffb57993f.tar.gz
linux-d737278091fccda77f6896012ba86c5ffb57993f.tar.bz2
linux-d737278091fccda77f6896012ba86c5ffb57993f.zip
btrfs: free ulist in qgroup_shared_accounting() error path
If tmp = ulist_alloc(GFP_NOFS) fails, we return without freeing the previously allocated qgroups = ulist_alloc(GFP_NOFS) and cause a memory leak. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/qgroup.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index cf5aead95a7f..98cb6b2630f9 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1798,8 +1798,10 @@ static int qgroup_shared_accounting(struct btrfs_trans_handle *trans,
return -ENOMEM;
tmp = ulist_alloc(GFP_NOFS);
- if (!tmp)
+ if (!tmp) {
+ ulist_free(qgroups);
return -ENOMEM;
+ }
btrfs_get_tree_mod_seq(fs_info, &elem);
ret = btrfs_find_all_roots(trans, fs_info, oper->bytenr, elem.seq,