From 9218084a5ed629eb5017b378b642f87859298ae9 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Tue, 19 Jul 2011 22:51:49 +0000
Subject: [PATCH] --- yaml --- r: 256594 b: refs/heads/master c:
 1511022c9aabf253253e35730a6a3b945a2a53a9 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/core/skbuff.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7c7b312304f2..c8c5a86e8c8d 100644
--- 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
index d220119f13ab..2beda824636e 100644
--- 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;