diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-11-14 11:56:56 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-16 22:57:45 +0100 |
commit | 709e8697af1c86772c1a6fccda6d4b0e2e226547 (patch) | |
tree | 6ff4c6cfc2f9b6274363ae2b0baa828b641af7a7 /net | |
parent | net-next:asix: V2 Update VERSION (diff) | |
download | linux-709e8697af1c86772c1a6fccda6d4b0e2e226547.tar.xz linux-709e8697af1c86772c1a6fccda6d4b0e2e226547.zip |
tcp: clear xmit timers in tcp_v4_syn_recv_sock()
Simon Kirby reported divides by zero errors in __tcp_select_window()
This happens when inet_csk_route_child_sock() returns a NULL pointer :
We free new socket while we eventually armed keepalive timer in
tcp_create_openreq_child()
Fix this by a call to tcp_clear_xmit_timers()
[ This is a followup to commit 918eb39962dff (net: add missing
bh_unlock_sock() calls) ]
Reported-by: Simon Kirby <sim@hostway.ca>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Tested-by: Simon Kirby <sim@hostway.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index a7443159c400..a9db4b1a2215 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1510,6 +1510,7 @@ exit: NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS); return NULL; put_and_exit: + tcp_clear_xmit_timers(newsk); bh_unlock_sock(newsk); sock_put(newsk); goto exit; |