* [PATCH 2.6] sock_put() on a TIMEWAIT socket
@ 2004-03-29 2:04 Nivedita Singhvi
2004-03-29 5:53 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: Nivedita Singhvi @ 2004-03-29 2:04 UTC (permalink / raw)
To: David Miller; +Cc: netdev
Instances of sock_put() being used instead of tcp_tw_put().
This is for the 2.6 tree.
Patch applies to 2.6.4, but should apply cleanly
to later versions as well.
thanks,
Nivedita
diff -urN linux-2.6.4/net/ipv4/tcp_ipv4.c linux-2.6.4mc/net/ipv4/tcp_ipv4.c
--- linux-2.6.4/net/ipv4/tcp_ipv4.c 2004-03-10 18:55:25.000000000 -0800
+++ linux-2.6.4mc/net/ipv4/tcp_ipv4.c 2004-03-28 17:26:52.000000000 -0800
@@ -1825,12 +1825,15 @@
goto discard_it;
do_time_wait:
- if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))
- goto discard_and_relse;
+ if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
+ 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);
- goto discard_and_relse;
+ tcp_tw_put((struct tcp_tw_bucket *) sk);
+ goto discard_it;
}
switch (tcp_timewait_state_process((struct tcp_tw_bucket *)sk,
skb, th, skb->len)) {
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 2.6] sock_put() on a TIMEWAIT socket
2004-03-29 2:04 [PATCH 2.6] sock_put() on a TIMEWAIT socket Nivedita Singhvi
@ 2004-03-29 5:53 ` David S. Miller
0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2004-03-29 5:53 UTC (permalink / raw)
To: Nivedita Singhvi; +Cc: netdev
Both 2.4.x and 2.6.x variants applied.
Good catch.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-03-29 5:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-03-29 2:04 [PATCH 2.6] sock_put() on a TIMEWAIT socket Nivedita Singhvi
2004-03-29 5:53 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).