From nobody Wed Feb 5 20:46:21 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 4YpC251x1vz5mN5F; Wed, 05 Feb 2025 20:46:21 +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 4YpC2518RMz3NPN; Wed, 05 Feb 2025 20:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788381; 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=PU4eYl2FUz0ZhCc8l5jYnO7mGkq5JCXLgNk0nmw2qcA=; b=QQSFI5Tvrd3kmotM0aeGNA8IMecnwvWOfVEI5ziw8dsJ+J2QrCWSSP+cY9yUbbUeMBvX0l 6ZpgXHAahLJIljCIfjKkkJCcS3y77JKjjfp4Bj2zmcC+HqPP1A6LOPHF70siQrkOnfD2VQ iKygvxnG/jogMDm6OHZdfS+4BhHs4LM3Sr+py0rwyvYeqQYq7atU8UirFQj7EpbcNKkUNc NBBJIYSn63HWCJP37qbIfrh6JzRv3IyY0EWQKbvt/gl52EDrb/ZUAjWRPsA4dV7fNDOc93 eTIb74lxllDzxyirK4rHGAgB4j5JG7WOehfY48ezCWZ4c/SbNhqSb+b/wDiNWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788381; 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=PU4eYl2FUz0ZhCc8l5jYnO7mGkq5JCXLgNk0nmw2qcA=; b=tgYRhWw+L6y953jVCNXYBl6XzxZxUnUy13Dm97lz4pdq9K9KNReylshQGWYcOJ4tRvnBZo H3RCqIbwNNxOJojTwkHeKyT0BYitEjgRuuPZW4hzdDRl70N9DyaxbkzrkNJ+HXX04gj17r HazwlnyPqiltmIyub4xCe2Fy6Cq9FHaZFX7Ff3/n//11f3NYXoTifdQLa44FzQnlvBAZa0 A33qsrws6G+KfKCz+j2z0LW2pd1EDZpv0C9bKc1j/8njq+3+W6Vmux5GO6PF1mTQFguHUJ uMqlPaldqHc1Hsu1+zvP8qi0J7pVz8DpnMPzWdNw2D9GJ/AUmZEu36J1Am+QKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788381; a=rsa-sha256; cv=none; b=FWTsS/7bI/t+ECQ5ZwHfvD9qK4LS8qnYgz296RQ2mmr25hCFatNZPoS/EWLn8ObA9eLqd5 MIn9RAwmXaRLRXndDluC6O3vHBd1aAfNTTXrVkGOxJr2ktM2MzinIV2E62Zj2TbXuON/JK mKrYGjSiXwedMDkyHJNTOXNLwT8peQAMyW1jbWqpjKlcVz2JvFQ55b+KFRjpMzRZF9jwsN 8rZPRIWrs6hhIEcUZgcHvnOlr8UqL8t1p1kM3RJR/W5LYDt/+GWXT59psMRNwmNw10/lnj DTB9Zhnvt9ZC2Hr1Tg+hK7rRa11IbkN+NaBWT4UCBPPdt7A71EsBYDPN5055sQ== 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 4YpC250jP6z16tT; Wed, 05 Feb 2025 20:46:21 +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 515KkL9b084620; Wed, 5 Feb 2025 20:46:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KkLQY084617; Wed, 5 Feb 2025 20:46:21 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:46:21 GMT Message-Id: <202502052046.515KkLQY084617@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: ed530aaa4722 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: ed530aaa4722b0b7bacc25735699f3603a613318 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ed530aaa4722b0b7bacc25735699f3603a613318 commit ed530aaa4722b0b7bacc25735699f3603a613318 Author: Michael Tuexen AuthorDate: 2025-01-03 18:44:43 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:31:38 +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 07430a0564d0..a8c2ad547a5d 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -3857,7 +3857,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;