---

yaml
---
r: 332511
b: refs/heads/master
c: 5dc67d0
h: refs/heads/master
i:
  332509: 0a8db62
  332507: 6c928c4
  332503: d059518
  332495: 2ef5d0c
  332479: 6db4cd8
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e126f32f88095ad1bd01b3c451e52aa9094f45c
+refs/heads/master: 5dc67d0ba915cda01ed3a980502945edf2c46b70

trunk/fs/btrfs/send.c

@@ -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)
@@ -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);