[TCP]: IPV6, do not use sock_put() on timewait sockets.

3a57ff0c · Nivedita Singhvi · Stephen Hemminger · 11b82997 · 3a57ff0c
Commit 3a57ff0c authored Mar 31, 2004 by Nivedita Singhvi Committed by Stephen Hemminger Mar 31, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

net/ipv6/tcp_ipv6.c net/ipv6/tcp_ipv6.c +6 -4

No files found.
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1639,7 +1639,7 @@ static int tcp_v6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
 no_tcp_socket:
 	if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb))
-		goto discard_and_relse;
+		goto discard_it;
 	if (skb->len < (th->doff<<2) || tcp_checksum_complete(skb)) {
 bad_packet:
@@ -1662,12 +1662,14 @@ static int tcp_v6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
 	goto discard_it;
 do_time_wait:
-	if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb))
+	if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) {
-		goto discard_and_relse;
+		tcp_tw_put((struct tcp_tw_bucket *) sk);
+		goto discard_it;
+	}
 	if (skb->len < (th->doff<<2) || tcp_checksum_complete(skb)) {
 		TCP_INC_STATS_BH(TcpInErrs);
-		sock_put(sk);
+		tcp_tw_put((struct tcp_tw_bucket *) sk);
 		goto discard_it;
 	}