From nobody Mon Sep 19 10:49:57 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 4MWLzT2Q1hz4cSNr; Mon, 19 Sep 2022 10:49:57 +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 4MWLzT1yPtz433P; Mon, 19 Sep 2022 10:49:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663584597; 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=Ha7LIkqEugo4M37Szl+yb/ESw95Xk0OS9NWGnhB0JQ0=; b=lZ7VWfcxC4yo3WsVnVC+Y3QdQuKAnP6x24XoS6eYnkvM4DjmMKNg56t+XztRt938wdonFc H0sZTNl7ZaJBZLcvLYcWtPAi1yqsvivF809I4mIgRUDMAqQhaz7rcCoi9LdDhNFVTlQ8an cJvjBjSxo6H8a7rrrX7x7S4VwetAm9BzRI0w/0fAefkfC3KW6hO80zQVn4AQrzs810i404 G742oG1L4NziFDNRI/AedR4+hpEq0rsEVVRe2nHdUz7OC31BTNqX07/t0sla4Xf3RrDYMU y2I3WVG5F01+5CDCM9Z/tCdZg/MFjthyhogdX1uDtAkvS1PMkjWhi2DYZ/UMWw== 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 4MWLzT0wVfzM7X; Mon, 19 Sep 2022 10:49:57 +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 28JAnvk0078639; Mon, 19 Sep 2022 10:49:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28JAnvCx078638; Mon, 19 Sep 2022 10:49:57 GMT (envelope-from git) Date: Mon, 19 Sep 2022 10:49:57 GMT Message-Id: <202209191049.28JAnvCx078638@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: 6d9e911fbadf - main - 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d9e911fbadf3b409802a211c1dae9b47cb5a2b8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663584597; 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=Ha7LIkqEugo4M37Szl+yb/ESw95Xk0OS9NWGnhB0JQ0=; b=sgyoNbqPlSYRIHRsnhipCFSF2/JSGfcafFP0Zra6TDv2zQGwwTG5q2/RUKEhRvSJXQ/bu2 f2XVk8Nd/U4Bh6My+gH9Z0MTIewkFyXRxNjQv6XFCpcjILjxIaFrx0X099jKOUC035ExPe SzaQWTs56tiHu+N+2Df822v+dsaDEbyftzd27rugOFhORyZBExVTQZEr4Vxqjwyet0AGsY YKxw/AfKL8qAbprmeColXm36s2S/J4aU73Ia6XiyUep0KtQW50i1l4KkjBhkvrLyGZXtBG SI7JrEfAsAiZo1S23jVMrQ+bZNfcosOnS2LTIHpSRnsBl75wga4lWRqW34H9fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663584597; a=rsa-sha256; cv=none; b=W+uDQO53KAe6c9eNPhyMtLrOyLPCpZPngjJl4ijz+8GLnyOAa2AS4s57/PcxejPT1TXYLr S4BwKDwzw2hiC6WcUIDtUSCZ5AD2BcDoVJjoTIu9u27DCl4pce6bxzS45UVWIA8z3Yu2ck /jqFnDBOqEaKL3qndrjQE1WMV0QtgC/qPlNjWnUg79xGj6JPZG7xCuT/HHQkxPRCQ/aVO0 Lg4PaSddjriSZqX9zlPfG+YgZPGxk4Zw7BhC3L5oFyKjqf7t8mqZE4L4Z1C0l+1DjJw3uQ HZWGWVqsMnsVBzNwGfnLBdzeiO6Sy9goY+x6lN76tGrIRGP53bjiS+pgcc8NDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6d9e911fbadf3b409802a211c1dae9b47cb5a2b8 commit 6d9e911fbadf3b409802a211c1dae9b47cb5a2b8 Author: Michael Tuexen AuthorDate: 2022-09-19 10:42:43 +0000 Commit: Michael Tuexen CommitDate: 2022-09-19 10:49:31 +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 --- 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 0630e288c20f..1a8887984b7f 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -338,10 +338,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);