openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: do not call sock_put() on TIMEWAIT sockets 

commit 3ab5aee7fe ("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>
This commit is contained in:
Eric Dumazet 2013-10-01 21:04:11 -07:00 committed by David S. Miller
parent 28ad7b06f4
commit 80ad1d61e7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/inet_hashtables.c
View File

@ -287,7 +287,7 @@ struct sock *__inet_lookup_established(struct net *net,
if (unlikely(!INET_TW_MATCH(sk, net, acookie, if (unlikely(!INET_TW_MATCH(sk, net, acookie,
saddr, daddr, ports, saddr, daddr, ports,
dif))) { dif))) {
sock_put(sk); inet_twsk_put(inet_twsk(sk));
goto begintw; goto begintw;
} }
goto out; goto out;

2
net/ipv6/inet6_hashtables.c
View File

@ -116,7 +116,7 @@ struct sock *__inet6_lookup_established(struct net *net,
} }
if (unlikely(!INET6_TW_MATCH(sk, net, saddr, daddr, if (unlikely(!INET6_TW_MATCH(sk, net, saddr, daddr,
ports, dif))) { ports, dif))) {
sock_put(sk); inet_twsk_put(inet_twsk(sk));
goto begintw; goto begintw;
} }
goto out; goto out;