From nobody Wed Feb 05 20:46:14 2025 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 4YpC1z1z8jz5mN2R; Wed, 05 Feb 2025 20:46:15 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpC1z0T3Dz3NNL; Wed, 05 Feb 2025 20:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788375; 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=QHmqgQ2opCiAGqqQow1DNtdTxXFqsfu2dPRunRjFRCc=; b=t1W9xdqsm9tzZ7xKbc+eRerE3UnO/JWHhqgGbZYkupYhiZ1cIrBLcKvQ+c7UK+tf78JzJm S7iltt9gZgfbfIVjcracHTBCgCi1FwJfJOgQZ4PP/0aVfFLfIl3PefKKPJ40S7+fydkcVb jhwjnM893eCPAt7A7w4MX82svcxbm7yIQLiF6hA4VHGV8lZi+CObmEPb4u2dxKS5Q3SbtD KihdA9cOuR3qTWdZyBErLqGRWefEOgGFKIhDD9mR64D3pYcZo97MEmErZChIlQlZwSbqJJ 1NRQgw6wreF+EBg9F6PROsbsYNTkpnmYG/EaGjynceGBWxRvgH325g3e/TePZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788375; 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=QHmqgQ2opCiAGqqQow1DNtdTxXFqsfu2dPRunRjFRCc=; b=MN9gEsyRJvH/WZldccT+wsJ3xCpMGmsYBwqWYyK79DOoi7FdfHSmvsS6XP17GmJn1g8V1r yJ5F4KsKOZA1SAcPgJ6GfNQ+10gULBx0qSxrQwzicicWdJiJCXPE4wAr+U1dIzyp5kNLQA YW2SPGhNBEzgBNkVpNbh04gcP9oiqtun/HVSiGna9tHZWIgrJSoN+DuHEWmjkn3es1hC/L yVgpUnSBDxn466dcRMo6aWqn1iEM6jyWGVezvk4j5hMT+O53o0C1v0tG8s1juCDKUQ8OKA XLgL/zejC/y4C8P3syZeOakhj5facUePbxlN+oybMy/2b1XX6iiBLijKNGn6zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788375; a=rsa-sha256; cv=none; b=XJ3KdTEM5RGq4MY6XnEerh2n5qR1YyIOHTaZAVBM6i9ZZgL4a8EIONEWHpYOpPdh1X4FA9 EYrj9nvr5PlO1GNdBhwBsH6qTb5S7yw+nqo2inTqfloLMpcK73P2MwsY4uvUgViI9SDnF5 Nve+ODV0Kyz/o52RR1lC4R27ZRAsNfyPStJtRnWg8CQ/Z62zyHDc1VblIb6AwUyJjSHnnx Fj0n8haERoqyCdUQs8J3x6XSq+DYWrghLdijRrKd0yujVZ3qbZIDPWhKHb2YFBDSIO3heH RmnR9EUCwJu7jZrJjp8G1817tpI0bXc+Nb7SCwFI7BuAgNYwXmJbe0y6I9tPjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YpC1z04jBz16PC; Wed, 05 Feb 2025 20:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 515KkEN9084476; Wed, 5 Feb 2025 20:46:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KkEYf084473; Wed, 5 Feb 2025 20:46:14 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:46:14 GMT Message-Id: <202502052046.515KkEYf084473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: c178bc193490 - stable/14 - TCP BBR: fix integer overflow List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c178bc1934901cf825c813bed2f3559c4e35dff7 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c178bc1934901cf825c813bed2f3559c4e35dff7 commit c178bc1934901cf825c813bed2f3559c4e35dff7 Author: Michael Tuexen AuthorDate: 2025-01-03 18:44:43 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:46:22 +0000 TCP BBR: fix integer overflow Use 64-bit arithmetic. Reviewed by: rrs CID: 1523806 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48302 (cherry picked from commit 88766e7af52bbde32b14ad48fb76798a3ba4650c) --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 762fb53fcdd7..1d030230748f 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -3842,7 +3842,7 @@ bbr_post_recovery(struct tcpcb *tp) else if (bbr->r_ctl.rc_delivered == 0) lr2use = 1000; else { - lr2use = bbr->r_ctl.rc_lost * 1000; + lr2use = (uint64_t)bbr->r_ctl.rc_lost * (uint64_t)1000; lr2use /= bbr->r_ctl.rc_delivered; } lr2use += bbr->r_ctl.recovery_lr;