diff options
| author | Alexander Block <ablock84@googlemail.com> | 2012-08-01 12:07:43 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2012-10-01 21:18:56 +0200 |
| commit | 5dc67d0ba915cda01ed3a980502945edf2c46b70 (patch) | |
| tree | 667aabdf4a246bd45de00b7d2ca298732d11f3c3 /fs/btrfs/send.c | |
| parent | Btrfs: remove unused tmp_path from iterate_dir_item (diff) | |
| download | linux-5dc67d0ba915cda01ed3a980502945edf2c46b70.tar.xz linux-5dc67d0ba915cda01ed3a980502945edf2c46b70.zip | |
Btrfs: free nce and nce_head on error in name_cache_insert
Both were leaked in case of error.
Reported-by: Alex Lyakas <alex.bolshoy.btrfs@gmail.com>
Signed-off-by: Alexander Block <ablock84@googlemail.com>
Diffstat (limited to 'fs/btrfs/send.c')
| -rw-r--r-- | fs/btrfs/send.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index b0f9df30f24d..cfbe987f854b 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -1759,6 +1759,7 @@ out: * 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) @@ -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); |