diff options
author | Yuchung Cheng <ycheng@google.com> | 2018-11-28 16:06:43 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-11-30 17:22:41 -0800 |
commit | 3976535af0cb9fe34a55f2ffb8d7e6b39a2f8188 (patch) | |
tree | f0dd1d7bf303e1a7b4bc668ccdcf24bc041ae0b2 /net/ipv4/tcp_timer.c | |
parent | c0f53771ba45745e5870daf880127925c93f232f (diff) | |
download | linux-stable-3976535af0cb9fe34a55f2ffb8d7e6b39a2f8188.tar.gz linux-stable-3976535af0cb9fe34a55f2ffb8d7e6b39a2f8188.tar.bz2 linux-stable-3976535af0cb9fe34a55f2ffb8d7e6b39a2f8188.zip |
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>
Diffstat (limited to 'net/ipv4/tcp_timer.c')
-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 091c53925e4d..25efdae4368a 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. */ |