From nobody Wed Feb 1 23:48:39 2023 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 4P6dsh16Ccz3cMp1; Wed, 1 Feb 2023 23:48:40 +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 4P6dsh0ZFpz3Ql7; Wed, 1 Feb 2023 23:48:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675295320; 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=3AUciznX5OvwwaPwyvOfuF4rypaDP31O0+pLPMdMCto=; b=kCEFEkMEoNhh7fKfnlIcSERSocjFgd5FHRQJhXEtTVvlbQuRTnCnPv2+vbv0Aw3KV5k3yU sy2tCh1VxDG4H4SPQOTXfacvBY9s7XbUuf8P13EdgJNSMu3ujzhHBu56bSuwTtAVO8kweq g5aVQLuHMWROo5yLzhqIwDIK04bUWFRp1NV5H/9xJ7LhwsJAbcEEuomp4ZfKMigSWFOVay gRHJwVSj6Z5mvqZrZQKdKjG0ItZA2BVnlfbNuO92z3W+QGVwijGde2MNFHdhUkDNeOrzN/ RNUb2mwAI1tq9Fv4VRaEJuYERrddCCnLhv/XZS7vmEZIOzY2jO4YbqYWIfpmvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675295320; 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=3AUciznX5OvwwaPwyvOfuF4rypaDP31O0+pLPMdMCto=; b=J6LDbOCN8+7P4cLu4dK/cNwSFGMvmII4PfNplT4betZ8Y/QY9YbGv2yfzE7wEFmc63lnMa jW0Zeq2ftywW+T19BfcTaM5ezywcTtG2/8lwFdWpGFHu2b2qDTJgBUXzgHd91tK7AAJHJg HlW6LNOj08TSlVZlau7qgqJ+jIV1loQCr4KAWhsUyV+GtUUcbbZgeNg4Asf0S+Z0ipnVi0 wgyfFrZYwgEL8DlYS0HKUi93rOKFuwHWVxxkJ+gdbRRaO0/d8QApr5erxuiyQvAgUQLLPg XjgAfVkSMNjruN8KZ5d1LjzcgDIMQS9vHpiKQnitky0se2C/sLIQ6Q42DXwIMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675295320; a=rsa-sha256; cv=none; b=Egd1hY0kMwCeccz1PSk8asza05s4tPkJ+trdrLNqCl7jjMZXiDYzpTBdOjp92Fk0SAPu+C u2y6smVMx1KWkgFhlowIPsx/b1IyEUjBodwPXaVi8PikU42bXHwOZ8wCmHMdkUu5MSL955 jy2CQ/t7lPZiniynN0rJT5W2LIFDTI+D+kP73qTPyvZ7X65qdYBE6VzBuDiQA/MugDDGKS DRCy7zWIx+Id2p7iV4kg9d4BVWPBYIuCmWg9T6C+z4eFEixTDC08ay0478qi93qSpCO9RN 76/+yvY3ePydjFT29S+mJflf0I8IA59iegK4ETuXK2zpXUjQQWuY/aIDbbecWA== 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 4P6dsg6gbBzYXq; Wed, 1 Feb 2023 23:48:39 +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 311NmdXd090950; Wed, 1 Feb 2023 23:48:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NmdPL090949; Wed, 1 Feb 2023 23:48:39 GMT (envelope-from git) Date: Wed, 1 Feb 2023 23:48:39 GMT Message-Id: <202302012348.311NmdPL090949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: cd4974672ad3 - stable/13 - tcp: improve handling of SYN-ACK segments in TIMEWAIT state 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/stable/13 X-Git-Reftype: branch X-Git-Commit: cd4974672ad3204ebb27efb623f3aabfcc2b82ef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=cd4974672ad3204ebb27efb623f3aabfcc2b82ef commit cd4974672ad3204ebb27efb623f3aabfcc2b82ef Author: Michael Tuexen AuthorDate: 2022-10-03 12:46:47 +0000 Commit: Michael Tuexen CommitDate: 2023-02-01 23:47:53 +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@ Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D36864 (cherry picked from commit 2515552e6216095c3fa61d93ee024bb8861e07c2) --- sys/netinet/tcp_timewait.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index f15cf6dae762..86c5e62fc9b6 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -456,7 +456,8 @@ 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)) { tcp_twclose(tw, 0); TCPSTAT_INC(tcps_tw_recycles); return (1);