nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

l2tp: keep original skb ownership

Browse source 
There is no reason to orphan skb in l2tp.

This breaks things like per socket memory limits, TCP Small queues...

Fix this before more people copy/paste it.

This is very similar to commit 8f646c922d
("vxlan: keep original skb ownership")

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2014-03-05 18:19:34 -08:00 committed by David S. Miller
parent 2196269242
commit 31c70d5956
1 changed files with 2 additions and 21 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

23
net/l2tp/l2tp_core.c
View file

@ -1108,6 +1108,7 @@ static int l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb,
struct flowi *fl, size_t data_len) struct flowi *fl, size_t data_len)
{ {
struct l2tp_tunnel *tunnel = session->tunnel; struct l2tp_tunnel *tunnel = session->tunnel;
struct sock *sk = tunnel->sock;
unsigned int len = skb->len; unsigned int len = skb->len;
int error; int error;
@ -1131,7 +1132,7 @@ static int l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb,
/* Queue the packet to IP for output */ /* Queue the packet to IP for output */
skb->local_df = 1; skb->local_df = 1;
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
if (skb->sk->sk_family == PF_INET6 && !tunnel->v4mapped) if (sk->sk_family == PF_INET6 && !tunnel->v4mapped)
error = inet6_csk_xmit(skb, NULL); error = inet6_csk_xmit(skb, NULL);
else else
#endif #endif
@ -1151,23 +1152,6 @@ static int l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb,
return 0; return 0;
} }
/* Automatically called when the skb is freed.
*/
static void l2tp_sock_wfree(struct sk_buff *skb)
{
sock_put(skb->sk);
}
/* For data skbs that we transmit, we associate with the tunnel socket
* but don't do accounting.
*/
static inline void l2tp_skb_set_owner_w(struct sk_buff *skb, struct sock *sk)
{
sock_hold(sk);
skb->sk = sk;
skb->destructor = l2tp_sock_wfree;
}
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
static void l2tp_xmit_ipv6_csum(struct sock *sk, struct sk_buff *skb, static void l2tp_xmit_ipv6_csum(struct sock *sk, struct sk_buff *skb,
int udp_len) int udp_len)
@ -1221,7 +1205,6 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len
return NET_XMIT_DROP; return NET_XMIT_DROP;
} }
skb_orphan(skb);
/* Setup L2TP header */ /* Setup L2TP header */
session->build_header(session, __skb_push(skb, hdr_len)); session->build_header(session, __skb_push(skb, hdr_len));
@ -1287,8 +1270,6 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len
break; break;
} }
l2tp_skb_set_owner_w(skb, sk);
l2tp_xmit_core(session, skb, fl, data_len); l2tp_xmit_core(session, skb, fl, data_len);
out_unlock: out_unlock:
bh_unlock_sock(sk); bh_unlock_sock(sk);