From 46477fd802eca4a7160b2260d19c688cdc536b5f Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 7 Oct 2011 05:35:46 +0000
Subject: [PATCH] --- yaml --- r: 264379 b: refs/heads/master c:
 835acf5da239b91edb9f7ebe36516999e156e6ee h: refs/heads/master i:   264377:
 7373fb4a1a8ba6759d3e7e1291b7df06ad4bb00e   264375:
 9ca3ac6ccaee204cdfa24b9f6dc9221dc277c855 v: v3

---
 [refs]                     | 2 +-
 trunk/net/l2tp/l2tp_core.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f0b0ce62bb15..b1c735187496 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ce5cce895309862d2c35d922816adebe094fe4a
+refs/heads/master: 835acf5da239b91edb9f7ebe36516999e156e6ee
diff --git a/trunk/net/l2tp/l2tp_core.c b/trunk/net/l2tp/l2tp_core.c
index ad4ac2601a56..34b2ddeacb67 100644
--- a/trunk/net/l2tp/l2tp_core.c
+++ b/trunk/net/l2tp/l2tp_core.c
@@ -1045,8 +1045,10 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len
 	headroom = NET_SKB_PAD + sizeof(struct iphdr) +
 		uhlen + hdr_len;
 	old_headroom = skb_headroom(skb);
-	if (skb_cow_head(skb, headroom))
+	if (skb_cow_head(skb, headroom)) {
+		dev_kfree_skb(skb);
 		goto abort;
+	}
 
 	new_headroom = skb_headroom(skb);
 	skb_orphan(skb);