diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2014-06-12 07:14:59 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-06-13 18:52:26 +0200 |
| commit | d737278091fccda77f6896012ba86c5ffb57993f (patch) | |
| tree | 41ccc9192cceeeaa0a8694b6c6d3a7e7fd71c43a | |
| parent | Btrfs: fix qgroups sanity test crash or hang (diff) | |
| download | linux-d737278091fccda77f6896012ba86c5ffb57993f.tar.xz 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>
| -rw-r--r-- | fs/btrfs/qgroup.c | 4 |
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, |