Skip to content

Commit

Permalink
btrfs: delayed-ref: double free in btrfs_add_delayed_tree_ref()
Browse files Browse the repository at this point in the history
There is a cut and paste error so instead of freeing "head_ref", we free
"ref" twice.

Fixes: 3368d00 ('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>
  • Loading branch information
Dan Carpenter authored and Chris Mason committed Jun 24, 2015
1 parent c40b7b0 commit 5a5003d
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions fs/btrfs/delayed-ref.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

/*
Expand Down

0 comments on commit 5a5003d

Please sign in to comment.