diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-06-24 16:32:33 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-06-24 21:28:03 +0200 |
| commit | 5a5003df98d5a7f6834227885b7c9728f767cc27 (patch) | |
| tree | 98450d55ad5520f8d66a48f5f3868977f1b0c482 /fs/btrfs | |
| parent | Merge branch 'sysfs-fsdevices-4.2-part1' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | linux-5a5003df98d5a7f6834227885b7c9728f767cc27.tar.xz linux-5a5003df98d5a7f6834227885b7c9728f767cc27.zip | |
btrfs: delayed-ref: double free in btrfs_add_delayed_tree_ref()
There is a cut and paste error so instead of freeing "head_ref", we free
"ref" twice.
Fixes: 3368d001ba5d ('btrfs: qgroup: Record possible quota-related extent for qgroup.')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/delayed-ref.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c index fd64fd0f011a..ac3e81da6d4e 100644 --- a/fs/btrfs/delayed-ref.c +++ b/fs/btrfs/delayed-ref.c @@ -650,18 +650,13 @@ int btrfs_add_delayed_tree_ref(struct btrfs_fs_info *fs_info, return -ENOMEM; head_ref = kmem_cache_alloc(btrfs_delayed_ref_head_cachep, GFP_NOFS); - if (!head_ref) { - kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref); - return -ENOMEM; - } + if (!head_ref) + goto free_ref; if (fs_info->quota_enabled && is_fstree(ref_root)) { record = kmalloc(sizeof(*record), GFP_NOFS); - if (!record) { - kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref); - kmem_cache_free(btrfs_delayed_ref_head_cachep, ref); - return -ENOMEM; - } + if (!record) + goto free_head_ref; } head_ref->extent_op = extent_op; @@ -682,6 +677,13 @@ int btrfs_add_delayed_tree_ref(struct btrfs_fs_info *fs_info, spin_unlock(&delayed_refs->lock); return 0; + +free_head_ref: + kmem_cache_free(btrfs_delayed_ref_head_cachep, head_ref); +free_ref: + kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref); + + return -ENOMEM; } /* |