diff options
author | Eric Dumazet <edumazet@google.com> | 2014-04-15 12:58:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-04-15 12:58:34 -0400 |
commit | b0270e91014dabfceaf37f5b40ad51bbf21a1302 (patch) | |
tree | 6bebc58cf422a4493d306a1a6fd658d0f02a411e /net/ipv4/tcp_output.c | |
parent | 1dd333f470b4e1767c9c0a14b05b5104e56b2930 (diff) | |
download | op-kernel-dev-b0270e91014dabfceaf37f5b40ad51bbf21a1302.zip op-kernel-dev-b0270e91014dabfceaf37f5b40ad51bbf21a1302.tar.gz |
ipv4: add a sock pointer to ip_queue_xmit()
ip_queue_xmit() assumes the skb it has to transmit is attached to an
inet socket. Commit 31c70d5956fc ("l2tp: keep original skb ownership")
changed l2tp to not change skb ownership and thus broke this assumption.
One fix is to add a new 'struct sock *sk' parameter to ip_queue_xmit(),
so that we do not assume skb->sk points to the socket used by l2tp
tunnel.
Fixes: 31c70d5956fc ("l2tp: keep original skb ownership")
Reported-by: Zhan Jianyu <nasa4836@gmail.com>
Tested-by: Zhan Jianyu <nasa4836@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r-- | net/ipv4/tcp_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 699fb10..025e250 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -981,7 +981,7 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, TCP_ADD_STATS(sock_net(sk), TCP_MIB_OUTSEGS, tcp_skb_pcount(skb)); - err = icsk->icsk_af_ops->queue_xmit(skb, &inet->cork.fl); + err = icsk->icsk_af_ops->queue_xmit(sk, skb, &inet->cork.fl); if (likely(err <= 0)) return err; |