Commit 2b37507f authored Nov 28, 2018 by Yuchung Cheng Committed by Greg Kroah-Hartman Dec 21, 2019

tcp: fix off-by-one bug on aborting window-probing socket



[ Upstream commit 3976535af0cb9fe34a55f2ffb8d7e6b39a2f8188 ]

Previously there is an off-by-one bug on determining when to abort
a stalled window-probing socket. This patch fixes that so it is
consistent with tcp_write_timeout().

Signed-off-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 92b28268

net/ipv4/tcp_timer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -336,7 +336,7 @@ static void tcp_probe_timer(struct sock *sk)
		return;
		}

		if (icsk->icsk_probes_out > max_probes) {
		if (icsk->icsk_probes_out >= max_probes) {
		abort: tcp_write_err(sk);
		} else {
		/* Only send another probe if we didn't close things up. */