git: e550130c07ce - stable/15 - tcp/rack: reject wma_divisor values <= 0

From: Maxim Konovalov <maxim_at_FreeBSD.org>
Date: Mon, 16 Nov 2026 03:30:58 UTC
The branch stable/15 has been updated by maxim:

URL: https://cgit.FreeBSD.org/src/commit/?id=e550130c07ce9cc6777f7581580ffe53846a2286

commit e550130c07ce9cc6777f7581580ffe53846a2286
Author:     Maxim Konovalov <maxim@FreeBSD.org>
AuthorDate: 2026-10-16 22:15:00 +0000
Commit:     Maxim Konovalov <maxim@FreeBSD.org>
CommitDate: 2026-11-16 03:28:18 +0000

    tcp/rack: reject wma_divisor values <= 0
    
    The net.inet.tcp.rack.measure.wma_divisor sysctl is the divisor
    of the goodput weighted moving average used when the dynamic
    goodput multiplier is enabled.  Setting it to 0 panics the kernel.
    
    Make the variable and the sysctl unsigned, reject 0 and values
    above INT32_MAX.
    
    MFC after:      1 month
    Found with:     Claude Code Opus 5.5
    Reviewed by:    tuexen, glebius, markj (early version)
    Differential Revision:  https://reviews.freebsd.org/D60759
    
    (cherry picked from commit 7668705cb9837d4c3a6db9b3434b3a522220c8ea)
---
 sys/netinet/tcp_stacks/rack.c | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c
index 1f64f7487463..1a2f6653ab79 100644
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@@ -274,7 +274,7 @@ static int32_t rack_rate_sample_method = USE_RTT_LOW;
 static int32_t rack_pace_every_seg = 0;
 static int32_t rack_delayed_ack_time = 40000;	/* 40ms in usecs */
 static int32_t rack_slot_reduction = 4;
-static int32_t rack_wma_divisor = 8;		/* For WMA calculation */
+static uint32_t rack_wma_divisor = 8;		/* For WMA calculation */
 static int32_t rack_cwnd_block_ends_measure = 0;
 static int32_t rack_rwnd_block_ends_measure = 0;
 static int32_t rack_def_profile = 0;
@@ -839,6 +839,22 @@ sysctl_rack_clear(SYSCTL_HANDLER_ARGS)
 	return (0);
 }
 
+static int
+sysctl_rack_wma_divisor(SYSCTL_HANDLER_ARGS)
+{
+	uint32_t val;
+	int error;
+
+	val = *(uint32_t *)arg1;
+	error = sysctl_handle_32(oidp, &val, 0, req);
+	if (error != 0 || req->newptr == NULL)
+		return (error);
+	if (val == 0 || val > INT32_MAX)
+		return (EINVAL);
+	*(uint32_t *)arg1 = val;
+	return (0);
+}
+
 static void
 rack_init_sysctls(void)
 {
@@ -1401,11 +1417,11 @@ rack_init_sysctls(void)
 	    "measure",
 	    CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
 	    "Measure related controls");
-	SYSCTL_ADD_S32(&rack_sysctl_ctx,
+	SYSCTL_ADD_PROC(&rack_sysctl_ctx,
 	    SYSCTL_CHILDREN(rack_measure),
-	    OID_AUTO, "wma_divisor", CTLFLAG_RW,
-	    &rack_wma_divisor, 8,
-	    "When doing b/w calculation what is the  divisor for the WMA");
+	    OID_AUTO, "wma_divisor", CTLTYPE_U32 | CTLFLAG_RW | CTLFLAG_MPSAFE,
+	    &rack_wma_divisor, 0, sysctl_rack_wma_divisor, "IU",
+	    "When doing b/w calculation what is the divisor for the WMA");
 	SYSCTL_ADD_S32(&rack_sysctl_ctx,
 	    SYSCTL_CHILDREN(rack_measure),
 	    OID_AUTO, "end_cwnd", CTLFLAG_RW,