net: do not call sock_put() on TIMEWAIT sockets

edumazet · gregkh · commit 53d384ae6a01 · 2013-11-04T04:31:00.000-08:00
[ Upstream commit 80ad1d6 ] commit 3ab5aee ("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>
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
@@ -287,7 +287,7 @@ struct sock *__inet_lookup_established(struct net *net,
 			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;
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
@@ -116,7 +116,7 @@ struct sock *__inet6_lookup_established(struct net *net,
 			}
 			if (unlikely(!INET6_TW_MATCH(sk, net, saddr, daddr,
 						     ports, dif))) {
-				sock_put(sk);
+				inet_twsk_put(inet_twsk(sk));
 				goto begintw;
 			}
 			goto out;

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ struct sock __inet_lookup_established(struct net net,`
`287`	`287`	`if (unlikely(!INET_TW_MATCH(sk, net, acookie,`
`288`	`288`	`saddr, daddr, ports,`
`289`	`289`	`dif))) {`
`290`		`- sock_put(sk);`
	`290`	`+ inet_twsk_put(inet_twsk(sk));`
`291`	`291`	`goto begintw;`
`292`	`292`	`}`
`293`	`293`	`goto out;`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ struct sock __inet6_lookup_established(struct net net,`
`116`	`116`	`}`
`117`	`117`	`if (unlikely(!INET6_TW_MATCH(sk, net, saddr, daddr,`
`118`	`118`	`ports, dif))) {`
`119`		`- sock_put(sk);`
	`119`	`+ inet_twsk_put(inet_twsk(sk));`
`120`	`120`	`goto begintw;`
`121`	`121`	`}`
`122`	`122`	`goto out;`