From nobody Wed Apr 17 13:50:27 2024 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 4VKMjw1hmnz5Gwnl; Wed, 17 Apr 2024 13:50:28 +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 4VKMjv6dc1z4nvG; Wed, 17 Apr 2024 13:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713361827; 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=yCPAOvGrx/w9XS8dhS0YKnufnI8ewCNsZzf5943FVBs=; b=oJ041vyGwEy2kqZ2STGng9yT8eGctgQlt0hvZmQmorGAS1ArtzzA9+7zWZ+mve116HTgkL OiiBRxojzdFgGMlrGj6GlWlnUoVw6estOsbkXuaHispwwVCKw01aHVOmt1MDTZw6kBC03H rs0DvcvkX74VRnc2xGqpbJYYyIkeIL68Y5xk1ReTAoUqPz4g534RSCXtJUGjuVKTEB4sqi 3iThC6im+S3nVKNlw3WgaehfM30F4oSHbgf6bkTb6oWIh250Isb/oqL6l9bvjgOmbplL4h /Qwl46zuaZZfeSV5edRD+oDYOdeH0/ysc3X6MLqhtYgdtcTEW1CfF4xGB/KtXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713361827; a=rsa-sha256; cv=none; b=lWrA3s9CWTrO8dF6645wRIJh9GseF/Rzko35fCxEATPovVl7HvvFlReDQMJQBiqGG4ELSz L95LWjiJJC3LA4SH5UAdQuYq7NLgbovfJ6Taz7cf7O0BTHfpD2dVMhDChigZ8xomTTq9UT qJRlaOoMxkrxZ8GgBMpwKS8ACrOGcw3Ki6WsUD+y1bvC2nfzDsgQciENcDgpOjsKwJf54c UBDXd3TIUx6SjQwjZU5iXg80zEGjWAxYPT1DyoRv1RJ/M/8EzrO0+DBSJzrq4n9IXzhfUo 0baDCdurX1+AJII3BjVBENli+4hGDifVo8Bi9GOuF4z/Ji/lBXvKcvtFquyvlA== 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=1713361827; 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=yCPAOvGrx/w9XS8dhS0YKnufnI8ewCNsZzf5943FVBs=; b=KSJ7jfWecXdyKeu+EpyktTbCrRIHFe5lSUBKrsJe0+qPo1jNXfLu3NVgENyAkd07iOsM5U Iuxd7mQ8AzKRUtjmSi6WszUlo6LT9Ri6k9G6XfhuAShC+Ot7/6DqVwfBWG0+1qRdxX0Q7O XbNV2i4UlwCiFZeG0DWlOAuxLxhuJ2EBUb3/n4dT6EaRC5vWeLTufTFg4hkJlC0uFbGxkZ GTgohOAfQ0fVm4jlQEW6JvYHcDT2nv/noG012Qato1PmGCDiRnXDkmBVz+ng92o+EknKP8 lZeMU5Cft//cIxDHmxVdLxwOnir1vQ2GvGsNua7JS1neH4jpnpzeoVV36T0Eng== 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 4VKMjv6F9LzSTX; Wed, 17 Apr 2024 13:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43HDoRwC029671; Wed, 17 Apr 2024 13:50:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HDoRoq029668; Wed, 17 Apr 2024 13:50:27 GMT (envelope-from git) Date: Wed, 17 Apr 2024 13:50:27 GMT Message-Id: <202404171350.43HDoRoq029668@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: fd2a580db248 - stable/14 - tcp: no data on SYN segments unless doing TFO 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: fd2a580db248502b5fd46867992e346a95298efe Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=fd2a580db248502b5fd46867992e346a95298efe commit fd2a580db248502b5fd46867992e346a95298efe Author: Michael Tuexen AuthorDate: 2024-03-22 10:12:56 +0000 Commit: Michael Tuexen CommitDate: 2024-04-17 13:50:02 +0000 tcp: no data on SYN segments unless doing TFO Ensure that there is no data on SYN segments unless doing TFO. This check is already in RACK and BBR. Reported by: glebius Reviewed by: rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44384 (cherry picked from commit af700f430fd86ba3eae63e587985a12436db8f69) --- sys/netinet/tcp_output.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 0d9fd8136554..9269ba443bd9 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -475,6 +475,12 @@ after_sack_rexmit: (tp->t_tfo_client_cookie_len == 0)) || (flags & TH_RST))) len = 0; + + /* Without fast-open there should never be data sent on a SYN. */ + if ((flags & TH_SYN) && !(tp->t_flags & TF_FASTOPEN)) { + len = 0; + } + if (len <= 0) { /* * If FIN has been sent but not acked,