From nobody Mon Oct 3 14:00:17 2022 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 4Mh2Xd61R8z4V8LB; Mon, 3 Oct 2022 14:00:17 +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 4Mh2Xd4450z41bQ; Mon, 3 Oct 2022 14:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664805617; 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=P82yndEeVk7iS9YchPnldTaT03NXpYA3izQj1G3weGc=; b=V0l0uSUeUy4XRz48HozqDb3c7TQjCHBUbWWJG6A89G9SQnfKzs+zOds3IGT1/sdfm66dxm WtyzVPjn0DjLPyOZFxxRy8KspWWBkOAPYeI8V6qt8LZBtjYtc7J1S7z1OQd7d0ragOYU2B fa8eaI93KzquWttLibXCKtKEFml011XydyFWWbgeqPPBSZZ8YqzQOqHisIByqwXrmtstHl M/OjDcO/cUMoYo73QqVG+41a6CBuHvofi0ZDeuk8IIb53RkpbfacMM0r8rnjmSi0WTnxFc N0+tqa8QVj4JBfQRHMaMtFLMJTb4aIWFCYDS1PnG9g6zM9p3KdhzScw13Hr7dw== 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 4Mh2Xd37S3zDhK; Mon, 3 Oct 2022 14:00:17 +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 293E0HRw067963; Mon, 3 Oct 2022 14:00:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 293E0HQs067957; Mon, 3 Oct 2022 14:00:17 GMT (envelope-from git) Date: Mon, 3 Oct 2022 14:00:17 GMT Message-Id: <202210031400.293E0HQs067957@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: 2515552e6216 - main - tcp: improve handling of SYN-ACK segments in TIMEWAIT state 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 2515552e6216095c3fa61d93ee024bb8861e07c2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664805617; 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=P82yndEeVk7iS9YchPnldTaT03NXpYA3izQj1G3weGc=; b=xDMsz+hPPNYn4q17fpc4VXA+j29Ny516BoIRC/9Ob0w558hQDFbgLLrLeLurYVERHjCsgP 5lbGgDhr+Z6q24zZlV1jk5dvE6UWlzNa8bCmTxIFUlftMnSDY+xinUC7gZ/wvwipZTYKHf Y7T4x3QgDVU4Gnm40CVDFm6O8ufGqqOvLKIe8T7EWit0xtCGvWFL7+Hf6WjhGEBMZW/cfn mFD2wdgfq2TPeVqVG9faPHdDrBBu8jLGy5Z2LnwopuUASDNAmqsKVtXZCLsljgY/zRDZUI xnt4ZEgP22Ot0y7PdtdRDfp+OnudrC0zNp7LPwxZ8OKKr7rEbwS8a91JSMqTXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664805617; a=rsa-sha256; cv=none; b=w8/f+Lhe6nwPH4So3NolSV7txst6eWuxpb/ziSketcXAkaqff7qM0Yun3q4bXIDZ3lrUcF OGQshLpwQL+2nPKBLA83dAP2dzoSsv1RP39vqvARFrncmG5VbDtQcQsMhHqv9y+1lvcQhP oa1Mw731oQXzfjITNDWS6sbnwEzaNibYKzHbjvSOK+e7VPqrDBkMHlYsA14pNP6gPBsn6U GiIUI5Vwd3zXKAioY+pemqf0nhzQVqmCYF8r2n8pLJC9pVyNAqSA/Gn/kL3XOFaiGKpIdC zusrxfju/RJncV0no/YQj2LG7zzZkpKE9/dW55njhnlvOwL+1zbgoTykDHp5gg== 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=2515552e6216095c3fa61d93ee024bb8861e07c2 commit 2515552e6216095c3fa61d93ee024bb8861e07c2 Author: Michael Tuexen AuthorDate: 2022-10-03 12:46:47 +0000 Commit: Michael Tuexen CommitDate: 2022-10-03 12:46:47 +0000 tcp: improve handling of SYN-ACK segments in TIMEWAIT state Only consider segments with the SYN bit set and the ACK bit cleared as "new connection attempts", which result in re-using a connection being in TIMEWAIT state. This results in consistent handling of SYN-ACK segments. Reviewed by: rscheff@ MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D36864 --- sys/netinet/tcp_timewait.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index ad97e2d3bed6..272734924384 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -464,13 +464,13 @@ tcp_twcheck(struct inpcb *inp, struct tcpopt *to, struct tcphdr *th, * are above the previous ones. * Allow UDP port number changes in this case. */ - if ((thflags & TH_SYN) && SEQ_GT(th->th_seq, tw->rcv_nxt)) { + if (((thflags & (TH_SYN | TH_ACK)) == TH_SYN) && + SEQ_GT(th->th_seq, tw->rcv_nxt)) { /* * In case we can't upgrade our lock just pretend we have * lost this packet. */ - if (((thflags & (TH_SYN | TH_ACK)) == TH_SYN) && - INP_TRY_UPGRADE(inp) == 0) + if (INP_TRY_UPGRADE(inp) == 0) goto drop; tcp_twclose(tw, 0); TCPSTAT_INC(tcps_tw_recycles);