diff options
| author | Julian Anastasov <ja@ssi.bg> | 2012-09-05 10:53:18 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-05 17:16:25 -0400 |
| commit | d013ef2aba8fe765ca683598e404203215632373 (patch) | |
| tree | 7b2dec8e9df0cc92a41e6ac80ed9812486923acb /net | |
| parent | 463dde19a759949c96d1c9da9efbb3a9b3a9eb61 (diff) | |
| download | linux-3.10-d013ef2aba8fe765ca683598e404203215632373.tar.gz linux-3.10-d013ef2aba8fe765ca683598e404203215632373.tar.bz2 linux-3.10-d013ef2aba8fe765ca683598e404203215632373.zip | |
tcp: fix possible socket refcount problem for ipv6
commit 144d56e91044181ec0ef67aeca91e9a8b5718348
("tcp: fix possible socket refcount problem") is missing
the IPv6 part. As tcp_release_cb is shared by both protocols
we should hold sock reference for the TCP_MTU_REDUCED_DEFERRED
bit.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index a3e60cc04a8..acd32e3f1b6 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -403,8 +403,9 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, tp->mtu_info = ntohl(info); if (!sock_owned_by_user(sk)) tcp_v6_mtu_reduced(sk); - else - set_bit(TCP_MTU_REDUCED_DEFERRED, &tp->tsq_flags); + else if (!test_and_set_bit(TCP_MTU_REDUCED_DEFERRED, + &tp->tsq_flags)) + sock_hold(sk); goto out; } |