diff options
| author | Eric Dumazet <edumazet@google.com> | 2013-10-01 21:04:11 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-11-28 14:01:56 +0000 |
| commit | ea54bc74c4cc418b395bc361fb1138255ea18080 (patch) | |
| tree | faffeca8eb7a7db8b5d3f8b27f2744115f78d13a /net/ipv6 | |
| parent | 7e3694085b35039ee57527ac6469d2202ba7cbd8 (diff) | |
| download | linux-stable-ea54bc74c4cc418b395bc361fb1138255ea18080.tar.gz linux-stable-ea54bc74c4cc418b395bc361fb1138255ea18080.tar.bz2 linux-stable-ea54bc74c4cc418b395bc361fb1138255ea18080.zip | |
net: do not call sock_put() on TIMEWAIT sockets
[ Upstream commit 80ad1d61e72d626e30ebe8529a0455e660ca4693 ]
commit 3ab5aee7fe84 ("net: Convert TCP & DCCP hash tables to use RCU /
hlist_nulls") incorrectly used sock_put() on TIMEWAIT sockets.
We should instead use inet_twsk_put()
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/inet6_hashtables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index 73f1a00a96af..e38290b7c7a1 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c @@ -110,7 +110,7 @@ begintw: goto out; } if (!INET6_TW_MATCH(sk, net, hash, saddr, daddr, ports, dif)) { - sock_put(sk); + inet_twsk_put(inet_twsk(sk)); goto begintw; } goto out; |