From nobody Mon Nov 16 03:30:58 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jSYKt1plzz70wC4 for ; Mon, 16 Nov 2026 03:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jSYKt18FHz54MD for ; Mon, 16 Nov 2026 03:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794799858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YaMlrct/bxVKe4MbmmYDdRe6w6yMI+J2yTcW36DBAbk=; b=GTCFuoMa/yPdo+Y1IGccwU2L5UsTdy1lwT0eviBUykuByjsRi8aJZs4851S9p/IfgydDpp XcorF6+k5cAWoY2FNTOAAqpQ3D24sk+a6dqw+WX7GwkZHD82Can3m7Kw/0pxco8miY8G3V fIHPtCPza+TEicarOWamPEOoslT+PgoUDp/uZPJKzXuO1T27xcgVpC7bnwZXRMVzNfgGAq ZLrTVBUvcPYQBjtsedmIKMrESTZhJwsomqIkQ9iOIjAjsubcoEe5ivbmj1jbmOEie2Mnys cVFNGnSHx9zSp+LD8lgdx/x6myV+tOgrU0PxMZQ0RBB4kVezC9XKiky1xYsWdA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794799858; b=E8+GiKglqjz+GZXutjI3I6PpJOZF057vRt9EyPsaiiwYXefKE7Bhh5HeceC7ixmyyLZM8S smPKD0PImF1lxiU8tVPxRpJod0U7ZRIstdI0RHAxbRr62I8YtZlSD1ysbfQiL/QspL3N9Y qAjH0zwpZlXcbwSl/pfrpt1defzsKTUyd+WqfCMIb9jksS1Zw8KrQRKXe6oRwKkW0NI5q7 eeJjY8wqdN+236OK07UXCVL+xBMmzH3UR9LevhTu2aUWlW6woJWnEf5gwhbp12N/0DAWGw b0/Chid20aqgvRGftvZ2deVaiK6GajHOZqc4tRdtUlRiJwTskD+GOr1G/reRIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794799858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YaMlrct/bxVKe4MbmmYDdRe6w6yMI+J2yTcW36DBAbk=; b=F7CwY3k8zAft6n2NebmGauxLo8uvewhnXjXxyuGzP7TtH5GBCFsR7s9qhKfa5H/o++o+EP 5Z/RLe1CHJPkNV0xBPkWUSkfVyt6TSU0XyV2H54Bg0XxTcb7dqe7SFuAMPbeoFGffyTfMH rby7/tsjBk6wpQaK9RdGvFu7Lz+DsNdMW4EnHqyYZaOXCVgzOLeYJXEFN0tP683rVRbAc2 BhpmDsa2KfM3KP9F7mCplNL45NCHgvlBNWlzEI7HdGisMscn2qQ/p3qFgkzUh5Hl4MxKQJ t4AjGLLNcUPysp1jYkvHgiGePEdaNWRun4Hzso496FIDShuMmWnt459AxFdvAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jSYKt0WG3zd89 for ; Mon, 16 Nov 2026 03:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2849 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 03:30:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Konovalov Subject: git: e550130c07ce - stable/15 - tcp/rack: reject wma_divisor values <= 0 List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e550130c07ce9cc6777f7581580ffe53846a2286 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 03:30:58 +0000 Message-Id: <6afa78f2.2849.45694431@gitrepo.freebsd.org> The branch stable/15 has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=e550130c07ce9cc6777f7581580ffe53846a2286 commit e550130c07ce9cc6777f7581580ffe53846a2286 Author: Maxim Konovalov AuthorDate: 2026-10-16 22:15:00 +0000 Commit: Maxim Konovalov 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,