From nobody Sun Sep 25 10:05:19 2022 X-Original-To: dev-commits-src-branches@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 4Mb1jC2fzhz4cstt; Sun, 25 Sep 2022 10:05:19 +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 4Mb1jC29Zdz3VFv; Sun, 25 Sep 2022 10:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664100319; 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=+gn/DFZmtJlTO0JyXsKVgA61YK4u0GBlbRudBnGQLhE=; b=seuhPiH0y3AIpf0S00OV7Q0TXxpP9GTr2zSSL7IBVkM+jvDxjxDaHpVjlWRz2KBbRdmN48 Ju5t3eUE9lxRt/sQQq7bQSFXs/fa5CmNdIVpDvTH3SKgFP23V33NzEtiOUuh2PnSb1D9qe x4fQsTsBOV7RkDzi/6JL3l/4bRoSqyhKZJMNbsGxL/9CPIiC+dfINRU1WGo/PwnwG3IG3J ov9ZOylJ9EOPlX5JPktEadXiGCLmum9nqeoHV1HBrq78YcWRAD2wlRep/j86z1SjG2QuDM 2kx+9H2azcKSXxJ8GcFxHr8r2znV0Hmc/nSSLHxhPBINr8E5YvLxkwpvUpar3w== 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 4Mb1jC1D3JzNm8; Sun, 25 Sep 2022 10:05:19 +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 28PA5J1N047480; Sun, 25 Sep 2022 10:05:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28PA5JmS047479; Sun, 25 Sep 2022 10:05:19 GMT (envelope-from git) Date: Sun, 25 Sep 2022 10:05:19 GMT Message-Id: <202209251005.28PA5JmS047479@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: 0612d3000b97 - stable/13 - tcp: fix computation of offset List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 0612d3000b974f31de15c90c77bf43f121fc8656 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664100319; 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=+gn/DFZmtJlTO0JyXsKVgA61YK4u0GBlbRudBnGQLhE=; b=fqbydPcwPvQMXCKuIasFu+bDmLHGl7GKY1E2lS/T56Ws0MZ3SU1I/Ej8hOCdWI+fNn+njm OJzo/N9YkU+3aNJFU7WWNWy/iTGKEhMea/81hxABIeRTxDy1IyBEqkVom8503PyOcWgX9w 7xbf6PvOjj6fyIeeQELHP5a4LqsPY6szfwaY54NtpKPvKeEho0QpHMnHoumMbBdHiNlKom U4wIyj++/kovmd1DYL9Pn0gvE8PM9KEM26b6Z7WBXJ+ki8iaDElv4vecohsp3ZybNHYdeA oFmaU8tDwy23paAzuM85Y7XAVl4TyO7P0z2QsbLbcSCMUayU8arffuXfG5MBgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664100319; a=rsa-sha256; cv=none; b=gNrZxYtCei8u6hU2uQh2oteOO6R3HfVGOrmfjQsuzI/GygQNtur1ybyfjG2bZItg2ww9XQ 7OslI5wy19ZL5S36BrnIrLP0ww7qrAFITaHzv2g/hy+8vMLqj3Htl+NXRVgyFUNJcnp3hb 0YIvA8FOUVDFnPoVayx95uMZ06Sedn8Ne8Okt8gOK2ktPa1XQysKT0tubaoxXMiVh5C6nT i8h6DUHr+5Trb0d1qM4e6uLirknqo93je9T0jTnA04Cu83ZhQaSZt7NUnDYkkJ97x8Fbr6 jUNiSiMXiywpD6sI/JZS4ylhrmbjN6WLFUjcPM0yzOtPkHW7Q5ebwKIftaGghw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=0612d3000b974f31de15c90c77bf43f121fc8656 commit 0612d3000b974f31de15c90c77bf43f121fc8656 Author: Michael Tuexen AuthorDate: 2022-09-19 10:42:43 +0000 Commit: Richard Scheffenegger CommitDate: 2022-09-25 08:54:18 +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 74721463e622..01dca2ba3ea1 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -334,10 +334,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);