diff options
| author | Yuchung Cheng <ycheng@google.com> | 2018-11-28 16:06:43 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-17 20:38:28 +0100 |
| commit | 5b7ff64f5040ced0118fce42b9b95230214ff70a (patch) | |
| tree | 4abb0a97f1865d9367ba40393d05c004e3cc1cd9 /net | |
| parent | 7422156369281a11f0ccbbb70de9d33979942429 (diff) | |
| download | linux-stable-5b7ff64f5040ced0118fce42b9b95230214ff70a.tar.gz linux-stable-5b7ff64f5040ced0118fce42b9b95230214ff70a.tar.bz2 linux-stable-5b7ff64f5040ced0118fce42b9b95230214ff70a.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 592d6e9967a9..04e2c43a43a5 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -358,7 +358,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. */ |