aboutsummaryrefslogtreecommitdiffstats
path: root/net/l2tp
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2011-10-07 05:35:46 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-11 09:36:26 -0800
commitc11deb8d898318a2fea9a291b16a7a2b2507cc94 (patch)
tree427e5f0ccb863dcb54fcc8cbc813e549091e72cc /net/l2tp
parentcbbd42eb61241fcd721f3b02bcb612894e2f02e6 (diff)
downloadkernel_samsung_smdk4412-c11deb8d898318a2fea9a291b16a7a2b2507cc94.zip
kernel_samsung_smdk4412-c11deb8d898318a2fea9a291b16a7a2b2507cc94.tar.gz
kernel_samsung_smdk4412-c11deb8d898318a2fea9a291b16a7a2b2507cc94.tar.bz2
l2tp: fix a potential skb leak in l2tp_xmit_skb()
[ Upstream commit 835acf5da239b91edb9f7ebe36516999e156e6ee ] l2tp_xmit_skb() can leak one skb if skb_cow_head() returns an error. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/l2tp')
-rw-r--r--net/l2tp/l2tp_core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index ed8a233..71c292e 100644
--- a/net/l2tp/l2tp_core.c
+++ b/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);