aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tuexen <tuexen@FreeBSD.org>2026-07-28 20:15:22 +0000
committerMichael Tuexen <tuexen@FreeBSD.org>2026-07-28 20:15:22 +0000
commit52b7cbcb78c14e89f6faec8da5acc2caa3d37208 (patch)
tree74a4a183f89f3f165fff101ae262e33cb9990939
parent2e259c209f6912bc99e18bbfb55dd10554b3b11d (diff)
tcp: improve handling of stopped timers
When a TCP timer is stopped, t_timers[] is set to SBT_MAX. Adding the corresponding t_precisions[], if it is not zero, would result in overflows in tcp_timer_next(). To avoid this, skip stopped timers. The problem was identified while debugging uperf by Lukas Book and an initial patch was provided by him. The committed patch was suggested by glebius. The problem can be observed by running netstat -nxptcp and looking for negative timer values and by observing very long running timers in some cases. Reported by: Lukas Book <lkbook@outlook.de> Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D58484
-rw-r--r--sys/netinet/tcp_timer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index ca242f2be627..57a4f3080df0 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -858,6 +858,8 @@ tcp_timer_next(struct tcpcb *tp, sbintime_t *precision)
sbintime_t after, before;
for (i = 0, rv = TT_N, after = before = SBT_MAX; i < TT_N; i++) {
+ if (tp->t_timers[i] == SBT_MAX)
+ continue;
if (tp->t_timers[i] < after) {
after = tp->t_timers[i];
rv = i;