Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80ad1d61 authored Oct 01, 2013 by Eric Dumazet Committed by David S. Miller Oct 02, 2013

net: do not call sock_put() on TIMEWAIT sockets



commit 3ab5aee7 ("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>

parent 28ad7b06

net/ipv4/inet_hashtables.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

net/ipv6/inet6_hashtables.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ begintw:
		}
		if (unlikely(!INET6_TW_MATCH(sk, net, saddr, daddr,
		ports, dif))) {
		sock_put(sk);
		inet_twsk_put(inet_twsk(sk));
		goto begintw;
		}
		goto out;