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/ipv4/inet_hashtables.c | |
| parent | 7e3694085b35039ee57527ac6469d2202ba7cbd8 (diff) | |
| download | kernel_samsung_smdk4412-ea54bc74c4cc418b395bc361fb1138255ea18080.zip kernel_samsung_smdk4412-ea54bc74c4cc418b395bc361fb1138255ea18080.tar.gz kernel_samsung_smdk4412-ea54bc74c4cc418b395bc361fb1138255ea18080.tar.bz2 | |
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/ipv4/inet_hashtables.c')
| -rw-r--r-- | net/ipv4/inet_hashtables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 984ec65..4afcf31 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -268,7 +268,7 @@ begintw: } if (unlikely(!INET_TW_MATCH(sk, net, hash, acookie, saddr, daddr, ports, dif))) { - sock_put(sk); + inet_twsk_put(inet_twsk(sk)); goto begintw; } goto out; |