From nobody Sun Sep 25 10:04:41 2022 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 4Mb1hT3WV9z4ct03; Sun, 25 Sep 2022 10:04:41 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mb1hT31llz3TNg; Sun, 25 Sep 2022 10:04:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664100281; 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=TmowMSbtFdxDW2brGenee7d5t18Xfaty8Ef2cTGdeto=; b=Y6Y27Sot9O42vWWVMbkoHQXUvahArg2Oixzzktfctmvw1WMHhEgmBM6OD8S04UpsrpJJMv PnwqRVsLFByYUTgNA7Gv3tQcilvFA8uSHtRvvfbnfi0Ss5do/x/bagpy57R1tnpK+/TiXo kfZA03AeoQPZ9hLuI7TJJB0D7kghgmQFkrUEHAhK2qhf1gF9oRNA/jOHhwJM1Djfr9bcLd 18kjaJzZUXJQMgkmNhRdtY38KmBT/pFnwBsffZigyoWSJ3lv7xif1+bCWNR4FJVfMxX1hv /bFu0LvjuPj5RkPM3SaDhLtudgIBSzCnSS8HYaF+CrV8Hk4E6i39XAY6L3/iCg== 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 4Mb1hT1xKFzNpH; Sun, 25 Sep 2022 10:04:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28PA4fEU047175; Sun, 25 Sep 2022 10:04:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28PA4fkC047174; Sun, 25 Sep 2022 10:04:41 GMT (envelope-from git) Date: Sun, 25 Sep 2022 10:04:41 GMT Message-Id: <202209251004.28PA4fkC047174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: 26370413d43b - stable/12 - tcp: fix computation of offset 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 26370413d43bfd65500270ff331ae6bdf0f54133 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664100281; 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=TmowMSbtFdxDW2brGenee7d5t18Xfaty8Ef2cTGdeto=; b=jkhpsDgebhc2USUEJNCdi52t7CI7AhWy/CFzKOV3mb8V2T9g2Eiy3AgaVzmwysie+x+lI0 cN7fi/s8fVoqkg93TNnfejYLMV2EJY+Xy+FNNQ2mwGKf6dI5wtw1eszGOt1K6PY+iVyZI+ pmZmCIip+aQu43vZV21qQ1X5DP49DVaXENmp6hkUexo41X+ihR1qYasAMFXNsH+k4p7Oy0 5yZ4N1TTX2FdigmpMJvfyLqbf0FqIdPTlmj9vKqn7XvEEP76uQXKEsiU4ya+90LphfjxDG kDtu2WYCxc6ZvAf7L7gp33B1tZAOp0rVz2fgX+EbtMvCWVirv5sOxeHOpjmSaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664100281; a=rsa-sha256; cv=none; b=A7Qqp/JJD9Hln18jKTX+Gq7URkjyDN6BEHf/PCebHrjc778i5h2hGXcm4BTssDDXmBL5Dn qR54fFjKSZTxIUiADjZZMGYmvwkiCK1SfoSXwPtP2/zZM94JtnVU5mvoy053NPQRjJxn5C t0ne9h8QUGF87RmYeQ7YvrFmfI3mvk/oFxW8rO2iGBGip638QG7QqtfBYEvwrpTsNS/FLM I0azgnHPfTT+N8zlx8dvlupil2w6yPPAIH244WyfHkFynWZ8k7+9/upx8MxQ6RiNUtTucC p89uuUVDBYBq0w1MWwdDpumQ188skvd9mNs1p0NxmOo1sALI9AnNFRKOcG99PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=26370413d43bfd65500270ff331ae6bdf0f54133 commit 26370413d43bfd65500270ff331ae6bdf0f54133 Author: Michael Tuexen AuthorDate: 2022-09-19 10:42:43 +0000 Commit: Richard Scheffenegger CommitDate: 2022-09-25 08:41:54 +0000 tcp: fix computation of offset Only update the offset if actually retransmitting from the scoreboard. If not done correctly, this may result in trying to (re)-transmit data not being being in the socket buffe and therefore resulting in a panic. PR: 264257 PR: 263445 PR: 260393 Reviewed by: rscheff@ MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D36626 (cherry picked from commit 6d9e911fbadf3b409802a211c1dae9b47cb5a2b8) --- sys/netinet/tcp_output.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index b486f6250508..e8d585a15d1c 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -317,10 +317,10 @@ again: len = ((int32_t)ulmin(cwin, SEQ_SUB(p->end, p->rxmit))); } - off = SEQ_SUB(p->rxmit, tp->snd_una); - KASSERT(off >= 0,("%s: sack block to the left of una : %d", - __func__, off)); if (len > 0) { + off = SEQ_SUB(p->rxmit, tp->snd_una); + KASSERT(off >= 0,("%s: sack block to the left of una : %d", + __func__, off)); sack_rxmit = 1; sendalot = 1; TCPSTAT_INC(tcps_sack_rexmits);