From nobody Sat Aug 10 10:28:42 2024 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 4Wgxp31yF0z5SWMV; Sat, 10 Aug 2024 10:28:43 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wgxp319R5z4qmX; Sat, 10 Aug 2024 10:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723285723; 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=MzkOW4uYiv9MS5s8+Qc0n5eIcnQenVqzM8vBwWDuvGg=; b=qKhkvwS96djLO7Oc5dz+P4UM/+VJeyw0FSoZs/IEwjwfcsZH8uVgcyhK9r0qyqeae0a6d0 qS+yDlZx19O184i8vmbn6dhUV6L7en22/4Esa5cAl8roVqoXSHTX+qsjA0CVGwI1nplq5T N3oV6iDGlpWu4kIF++YHQqAa3HV3hOD0aExF+LqThZUWT0s98CmzzeJ9hSOWQcASqsFE3i LM0u3WGdIAP6LaFRuqqVgKWc6c5A2JY4ueSDyeDX+mhhfDc84RGP0JQv4VtgMigUZowVTV tiXKnXdvk+xIDyBpXpj207PSEjLCE5q8dd5atQ1M5O9XF9yF8HDPhHBSeO1RwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723285723; a=rsa-sha256; cv=none; b=uB1BMwQ6sBTTcVZXk2wkNJL6g/cw1oPbT6Az2+mBouF02hPjZrv/iGmMGwZhaUJa5v+6RC AFX4DKkbUbntenEOQG90MY66YwPJIn2psRvTjInuVgwQoTjsPZTZlGafkzdJfcr+z4gXUr 1vjZLhNclNnG52dj/6o3vuuh2Vc3NV53iQTwryUB2SjBPAFr+KvZ2QdTMo7ju83IRVVQ76 ii6Wua3Rg44P2ERy4zwCgCPUS6infSCTN3IBCBLGBGzcrvfpQDy3uqJHo72xEB3vY4lzoH 7mCJvw9Equwjp7TXVr7B37W/0i9HpxmqNKemZ8hKb/1UE3Qp/QheEqFVXndRXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723285723; 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=MzkOW4uYiv9MS5s8+Qc0n5eIcnQenVqzM8vBwWDuvGg=; b=X/mY2+pZN2dRgebYpH3TQozVg0lYdIAQA6CuYAToBoitzi7P5f55UAjHEt/InWWLiae1Hv 9jAU6/WHkFD3w15RQ9OfgYE1iXB6tQhPtQB/YCq6dxh/d8TykNUZ7L3ERJ7OgyazMEMPPQ NKRMUxqdvZkWt1CrF3BuMSLDW+IhAhTvWSf917gjtfOA5dEiqeUMFms5cuUl1PoMdEd132 djHr2BneeZTbxAEaDCQtAxbSrT8vpK4tf9208w2SUlMTtdAko/FDicgEW8CpsUYTLJNGHd IbKRi0bFPzXxr+7oy30v/8j4+uEiNONUeBVWQxVmJ0F82CqMwMFbTdr9iMM1bQ== 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 4Wgxp30MCyzwRx; Sat, 10 Aug 2024 10:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47AASg0T013524; Sat, 10 Aug 2024 10:28:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47AASgYu013521; Sat, 10 Aug 2024 10:28:42 GMT (envelope-from git) Date: Sat, 10 Aug 2024 10:28:42 GMT Message-Id: <202408101028.47AASgYu013521@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: f7425802933f - stable/14 - tcp: fix t_flags2 collision 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: f7425802933f76c9af62c09a79a87753626281e0 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f7425802933f76c9af62c09a79a87753626281e0 commit f7425802933f76c9af62c09a79a87753626281e0 Author: Michael Tuexen AuthorDate: 2024-08-03 19:49:18 +0000 Commit: Michael Tuexen CommitDate: 2024-08-10 10:27:53 +0000 tcp: fix t_flags2 collision Fix the collision of TF2_IPSEC_TSO and TF2_NO_ISS_CHECK Fixes: 646c28ea80cb ("tcp: improve SEG.ACK validation") Sponsored by: Netflix, Inc. (cherry picked from commit 52eacec95d54205962a3d6902e18e41fce8b4e79) --- sys/netinet/tcp_var.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 9ba13b779616..83ea1608abe1 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -864,7 +864,7 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack) #define TF2_MBUF_QUEUE_READY 0x00020000 /* Inputs can be queued */ #define TF2_DONT_SACK_QUEUE 0x00040000 /* Don't wake on sack */ #define TF2_CANNOT_DO_ECN 0x00080000 /* The stack does not do ECN */ -#define TF2_NO_ISS_CHECK 0x00200000 /* Don't check SEG.ACK against ISS */ +#define TF2_NO_ISS_CHECK 0x00400000 /* Don't check SEG.ACK against ISS */ /* * Structure to hold TCP options that are only used during segment