diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-05-16 03:36:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-16 03:36:33 -0400 |
commit | a465419b1febb603821f924805529cff89cafeed (patch) | |
tree | 5131fa2dbf624ebeb6cf61bf4dc1bc9464fe0bbd /net/ipv6/tcp_ipv6.c | |
parent | 3b098e2d7c693796cc4dffb07caa249fc0f70771 (diff) |
net: Introduce sk_route_nocaps
TCP-MD5 sessions have intermittent failures, when route cache is
invalidated. ip_queue_xmit() has to find a new route, calls
sk_setup_caps(sk, &rt->u.dst), destroying the
sk->sk_route_caps &= ~NETIF_F_GSO_MASK
that MD5 desperately try to make all over its way (from
tcp_transmit_skb() for example)
So we send few bad packets, and everything is fine when
tcp_transmit_skb() is called again for this socket.
Since ip_queue_xmit() is at a lower level than TCP-MD5, I chose to use a
socket field, sk_route_nocaps, containing bits to mask on sk_route_caps.
Reported-by: Bhaskar Dutta <bhaskie@gmail.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 6603511e3673..2b7c3a100e2c 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -604,7 +604,7 @@ static int tcp_v6_md5_do_add(struct sock *sk, struct in6_addr *peer, | |||
604 | kfree(newkey); | 604 | kfree(newkey); |
605 | return -ENOMEM; | 605 | return -ENOMEM; |
606 | } | 606 | } |
607 | sk->sk_route_caps &= ~NETIF_F_GSO_MASK; | 607 | sk_nocaps_add(sk, NETIF_F_GSO_MASK); |
608 | } | 608 | } |
609 | if (tcp_alloc_md5sig_pool(sk) == NULL) { | 609 | if (tcp_alloc_md5sig_pool(sk) == NULL) { |
610 | kfree(newkey); | 610 | kfree(newkey); |
@@ -741,7 +741,7 @@ static int tcp_v6_parse_md5_keys (struct sock *sk, char __user *optval, | |||
741 | return -ENOMEM; | 741 | return -ENOMEM; |
742 | 742 | ||
743 | tp->md5sig_info = p; | 743 | tp->md5sig_info = p; |
744 | sk->sk_route_caps &= ~NETIF_F_GSO_MASK; | 744 | sk_nocaps_add(sk, NETIF_F_GSO_MASK); |
745 | } | 745 | } |
746 | 746 | ||
747 | newkey = kmemdup(cmd.tcpm_key, cmd.tcpm_keylen, GFP_KERNEL); | 747 | newkey = kmemdup(cmd.tcpm_key, cmd.tcpm_keylen, GFP_KERNEL); |