diff options
| author | Eric Dumazet <edumazet@google.com> | 2013-10-01 21:04:11 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-04 04:31:00 -0800 |
| commit | 53d384ae6a01eadb8d362afaca6a9c0ba72c1126 (patch) | |
| tree | aba32ca569cb48851b81d133bdaadb1773e838de /net/ipv4 | |
| parent | d8ac0f178f98d4e7c23cf9526d789d4869ec6e4c (diff) | |
| download | linux-3.10-53d384ae6a01eadb8d362afaca6a9c0ba72c1126.tar.gz linux-3.10-53d384ae6a01eadb8d362afaca6a9c0ba72c1126.tar.bz2 linux-3.10-53d384ae6a01eadb8d362afaca6a9c0ba72c1126.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4')
| -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 6af375afeee..c95848d0003 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -287,7 +287,7 @@ begintw: if (unlikely(!INET_TW_MATCH(sk, net, acookie, saddr, daddr, ports, dif))) { - sock_put(sk); + inet_twsk_put(inet_twsk(sk)); goto begintw; } goto out; |