Skip to content

Commit

Permalink
Btrfs: free nce and nce_head on error in name_cache_insert
Browse files Browse the repository at this point in the history
Both were leaked in case of error.

Reported-by: Alex Lyakas <alex.bolshoy.btrfs@gmail.com>
Signed-off-by: Alexander Block <ablock84@googlemail.com>
  • Loading branch information
Alexander Block authored and Chris Mason committed Oct 1, 2012
1 parent 3e126f3 commit 5dc67d0
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion fs/btrfs/send.c
Original file line number Diff line number Diff line change
Expand Up @@ -1759,6 +1759,7 @@ static int did_overwrite_first_ref(struct send_ctx *sctx, u64 ino, u64 gen)
* Insert a name cache entry. On 32bit kernels the radix tree index is 32bit,
* so we need to do some special handling in case we have clashes. This function
* takes care of this with the help of name_cache_entry::radix_list.
* In case of error, nce is kfreed.
*/
static int name_cache_insert(struct send_ctx *sctx,
struct name_cache_entry *nce)
Expand All @@ -1775,8 +1776,11 @@ static int name_cache_insert(struct send_ctx *sctx,
INIT_LIST_HEAD(nce_head);

ret = radix_tree_insert(&sctx->name_cache, nce->ino, nce_head);
if (ret < 0)
if (ret < 0) {
kfree(nce_head);
kfree(nce);
return ret;
}
}
list_add_tail(&nce->radix_list, nce_head);
list_add_tail(&nce->list, &sctx->name_cache_list);
Expand Down

0 comments on commit 5dc67d0

Please sign in to comment.