From nobody Fri Jan 03 18:47:20 2025 X-Original-To: dev-commits-src-main@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 4YPsy117mFz5kJY1; Fri, 03 Jan 2025 18:47: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 4YPsy10RKTz3xr7; Fri, 3 Jan 2025 18:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735930041; 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=LWtWtFnHux4PQ4ZJ9aLHZezwQks2T863zj+IMpduhNc=; b=vfyfeCMpO83uF9XVvxvPES2z3QsEfnncKH95LGXhDIHMlFPij5AU4++8QB8V97KXH0XnEk w1iuSDFo/FX9cxfLbMsccZitWjrtIUFqDivSDgxQKcCaA6e5JPRI9FmfdvX4hp+xdPQmLg rIrqpm8A4Ex9lvdXRtBPa4k7oMBsWly0EXAdGY/ztL8ELJiw5XAm9g2CIq2cEBR5Qx3r7d AvyQmh+hsqSZDi4XeK7EPRfGmZgyX7gHqt4MdE7sw49Q6vfOrkiYsQ8ghd8cepI+JSyqch CGy8zL1ILHl+diMHmKFNVw9bwvriV4XH9cgFcsWiJi/+POTicuBaQi2UuHSE8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735930041; 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=LWtWtFnHux4PQ4ZJ9aLHZezwQks2T863zj+IMpduhNc=; b=h6EyDoUk8bkrJdRSBi0RLgMomVmc+Mq29bN8YriJefPk0u2D0oqjpng1jbvuR1ypAtp4sA gnC5+eKoyruHGblsypFzzndUumrTAckbA4dmK7qLbkfLER60ohaQqikfrWzocWGnyEioI9 f7MCK+fgMwSLqet839HO1AJOHrpNKzyZCdgATk5UKLx+WrtUIwCJ61AbT4cBWdgEXKDwxC 5bfqjf9oWuN9qk3GFr0tkmE95ClkafcebNNZfJQ8kIxC+MMCZUPur/fCrIxF0oPwjRfb8q 23UzLyI1ty6fAq23lVUxJ7d51AJIhdT/NhsisemOOvBAXevLsg2Qd+FU3UCl3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735930041; a=rsa-sha256; cv=none; b=ZIWAXaHrgMip4bsTMnkJ5HFsCep7N9pizU85YeqAGzPMLx+kW/tmXmEfXEvc4dXgVkXics mtjaySR3uvI6eCMOKhkbZpJPelgVIPpyb3IDoujaCORxvO7lx4fDVNLhv2bVKpd1CqnnEQ vdOtslf2Ijr6hKbRFuf3Wf55mA6tsrhLeRQ9dnFFbd7KjeOE7BIMD75ZuID31WxXmRYoC0 qvWMkXz3yfmFZHrFb9uov/5LvhftXSXiscBgcNj2yPjhcdhQkq7vNy6dsVXu4T4ym4b6Fl IYGWwNFoMkt4FyjcJo6oMQABy6ZVKgCoWdrB/wA/agkCcggXaYYNNOK76CM7Cw== 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 4YPsy071pqz3Tj; Fri, 03 Jan 2025 18:47:20 +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 503IlK97097241; Fri, 3 Jan 2025 18:47:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503IlKlR097238; Fri, 3 Jan 2025 18:47:20 GMT (envelope-from git) Date: Fri, 3 Jan 2025 18:47:20 GMT Message-Id: <202501031847.503IlKlR097238@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 88766e7af52b - main - TCP BBR: fix integer overflow List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 88766e7af52bbde32b14ad48fb76798a3ba4650c Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=88766e7af52bbde32b14ad48fb76798a3ba4650c commit 88766e7af52bbde32b14ad48fb76798a3ba4650c Author: Michael Tuexen AuthorDate: 2025-01-03 18:44:43 +0000 Commit: Michael Tuexen CommitDate: 2025-01-03 18:44:43 +0000 TCP BBR: fix integer overflow Use 64-bit arithmetic. Reviewed by: rrs CID: 1523806 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48302 --- 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 fd5bcd81f25e..9e1f83df4298 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -3843,7 +3843,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;