2013-08-27 08:24:04

by Andrei Vagin

Subject: [PATCH] tcp: initialize rcv_tstamp for restored sockets

From: Andrew Vagin <[email protected]>

u32 rcv_tstamp; /* timestamp of last received ACK */

Its value used in tcp_retransmit_timer, which closes socket
if the last ack was received more then TCP_RTO_MAX ago.

Currently rcv_tstamp is initialized to zero and if tcp_retransmit_timer
is called before receiving a first ack, the connection is closed.

This patch initializes rcv_tstamp to a timestamp, when a socket was
restored.

Cc: Pavel Emelyanov <[email protected]>
Cc: Eric Dumazet <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Alexey Kuznetsov <[email protected]>
Cc: James Morris <[email protected]>
Cc: Hideaki YOSHIFUJI <[email protected]>
Cc: Patrick McHardy <[email protected]>
Reported-by: Cyrill Gorcunov <[email protected]>
Signed-off-by: Andrey Vagin <[email protected]>
---
net/ipv4/tcp_output.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 92fde8d..e297299 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2814,6 +2814,8 @@ void tcp_connect_init(struct sock *sk)

if (likely(!tp->repair))
tp->rcv_nxt = 0;
+ else
+ tp->rcv_tstamp = tcp_time_stamp;
tp->rcv_wup = tp->rcv_nxt;
tp->copied_seq = tp->rcv_nxt;

--
1.8.3.1

2013-08-29 19:12:10

by David Miller

Subject: Re: [PATCH] tcp: initialize rcv_tstamp for restored sockets

From: Andrey Vagin <[email protected]>
Date: Tue, 27 Aug 2013 12:20:40 +0400

> From: Andrew Vagin <[email protected]>
>
> u32 rcv_tstamp; /* timestamp of last received ACK */
>
> Its value used in tcp_retransmit_timer, which closes socket
> if the last ack was received more then TCP_RTO_MAX ago.
>
> Currently rcv_tstamp is initialized to zero and if tcp_retransmit_timer
> is called before receiving a first ack, the connection is closed.
>
> This patch initializes rcv_tstamp to a timestamp, when a socket was
> restored.
>
> Reported-by: Cyrill Gorcunov <[email protected]>
> Signed-off-by: Andrey Vagin <[email protected]>

Applied and queued up for -stable.