diff options
author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2017-11-01 14:32:15 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-11-02 08:16:27 +0100 |
commit | 4eebff27ca4182bbf5f039dd60d79e2d7c0a707e (patch) | |
tree | 4e4eb972c1a18167c2d5d0e394fb033f4b20b4db | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi... (diff) | |
download | linux-4eebff27ca4182bbf5f039dd60d79e2d7c0a707e.tar.xz linux-4eebff27ca4182bbf5f039dd60d79e2d7c0a707e.zip |
tcp_nv: fix division by zero in tcpnv_acked()
Average RTT could become zero. This happened in real life at least twice.
This patch treats zero as 1us.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: Lawrence Brakmo <Brakmo@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv4/tcp_nv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_nv.c b/net/ipv4/tcp_nv.c index 1ff73982e28c..125fc1450b01 100644 --- a/net/ipv4/tcp_nv.c +++ b/net/ipv4/tcp_nv.c @@ -252,7 +252,7 @@ static void tcpnv_acked(struct sock *sk, const struct ack_sample *sample) /* rate in 100's bits per second */ rate64 = ((u64)sample->in_flight) * 8000000; - rate = (u32)div64_u64(rate64, (u64)(avg_rtt * 100)); + rate = (u32)div64_u64(rate64, (u64)(avg_rtt ?: 1) * 100); /* Remember the maximum rate seen during this RTT * Note: It may be more than one RTT. This function should be |