---

yaml --- r: 256594 b: refs/heads/master c: 1511022 h: refs/heads/master v: v3
git-mirror · Jul 21, 2011 · 9218084 · 9218084
1 parent bed14a8
commit 9218084
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 536d1d4a076210f763b60d7c3823f2edbddf3a9c
+refs/heads/master: 1511022c9aabf253253e35730a6a3b945a2a53a9
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
@@ -799,7 +799,8 @@ struct sk_buff *pskb_copy(struct sk_buff *skb, gfp_t gfp_mask)
 
 		if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
 			if (skb_copy_ubufs(skb, gfp_mask)) {
-				kfree(n);
+				kfree_skb(n);
+				n = NULL;
 				goto out;
 			}
 			skb_shinfo(skb)->tx_flags &= ~SKBTX_DEV_ZEROCOPY;