From: Yuchung Cheng <ycheng@google.com>
Date: Thu, 29 Nov 2018 00:06:43 +0000 (-0800)
Subject: tcp: fix off-by-one bug on aborting window-probing socket
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3976535af0cb9fe34a55f2ffb8d7e6b39a2f8188;p=linux.git

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

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>
---

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 091c53925e4da..25efdae4368a3 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -378,7 +378,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. */