From nobody Thu Oct 09 08:00:15 2025 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 4cj2Nc2zxRz6BSHw; Thu, 09 Oct 2025 08:00:16 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cj2Nc1KrMz3wgF; Thu, 09 Oct 2025 08:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759996816; 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=a1ZkNShWVBnrv9UCaJEU2MjGy/GiXY6BT4yL12Yl+r4=; b=ooQxyIFJNY6lTxe5i71kJKCyZO54RNMWH9ybW8sZ7jd3Dw1VLIBMcum5xghMklWUhziJJ3 6TIcPgFb9GuF8tJ7r9megVZtpb4f1LgY487oBq//KPy0632TgeLMJuG8M34WLv/VQ2xZm5 BazBTxlGPrJM8+v5fGsDDIgLVGZX/lDlPdfOPC74JR1AnBUwDoTy7BN8S7cpKfsIEevhW5 9nOJry0mObHutgDA6TpO+qcyH1bHTrqO0Z6k1i7/GyT6yl396CHPgD4weR/gj6lxtap/J1 7grRhG9neBlxf6fhg5MtR0bQo1HntRXPbd3RLA7HTYwilgpe2f26RNy5nVcIbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759996816; 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=a1ZkNShWVBnrv9UCaJEU2MjGy/GiXY6BT4yL12Yl+r4=; b=R17tMTHBEQjiEZ3nXyizt/5450HuS+wkZ+w4hrVeA+0na/R0GJOUAvobhsZrKjoya0o4Qt jdGPdYEg5GF02Z6VIO2BXqUTbVCrTf3NSq0VbU0dO8mwCZRJ24Jl/09Kw6TLJduxSfYcNo dxzM84cKk+2JH3g3nFuqr7lBZmtaIfTBzqC9NPUASKdj26C07Ttx2QjRGJEpw/WBjsYMEq sNSJX1hZ06DkqSZX1m+XJv2yZ+ks19FHqZmycredEWaKq622tHNTHBmoTNcPwkgoDpwxt+ /ihXlSnaXxKjn3BYhYZDYItdLP2MOfL8JiPw7/XisQX2T63U5Dp0YjLOz6MMpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759996816; a=rsa-sha256; cv=none; b=wU16/uWwSMEJQTeFjLW9BuOLppgcIIpG37F5EZ+7uI3p7qK8oPjT7+skSNRgbBbSfbDAYd Pqa3LXTIj2YhvYB4nNdG6S8NeyadepHNt/cEQ1ctELolGQTVHWMa5SW4MXcEgkWehAuABJ dbO3OY04PzZfVhpkzUOx3xLwVtxvL3+a7y17k9fm8CgGJ3JbjjdI9lH1E5jP9NJLi5smRK aro060D6lVZD8/wtxVGIhKZGMLe+tPL8oFGq+j5VcCrIYr1HUtr37WO9qXFtYgo061Sztt bjWdWwrGBTHd6jZPrOYmX701AIAbvJr5xaAj6h4NNGX4AWM/tkrWsZNZbQ09IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cj2Nc0c7Hz17SS; Thu, 09 Oct 2025 08:00:16 +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 59980FHP051918; Thu, 9 Oct 2025 08:00:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59980FGd051912; Thu, 9 Oct 2025 08:00:15 GMT (envelope-from git) Date: Thu, 9 Oct 2025 08:00:15 GMT Message-Id: <202510090800.59980FGd051912@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: 41e9c68d9ac1 - stable/15 - tcp: improve SEG.ACK validation in SYN-RECEIVED 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/15 X-Git-Reftype: branch X-Git-Commit: 41e9c68d9ac186381163bdce05bbd7a1c9925661 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=41e9c68d9ac186381163bdce05bbd7a1c9925661 commit 41e9c68d9ac186381163bdce05bbd7a1c9925661 Author: Michael Tuexen AuthorDate: 2025-10-06 20:39:31 +0000 Commit: Michael Tuexen CommitDate: 2025-10-09 07:59:49 +0000 tcp: improve SEG.ACK validation in SYN-RECEIVED According to the fifth step in SEGMENT ARRIVES, send a RST segment in response to an ACK segment which fails the SEG.ACK check, but leave the endpoint state unchanged. FreeBSD handles this correctly when entering the SYN-RECEIVED state via the SYN-SENT state, but not in the SYN-cache code, which handles the SYN-RECEIVED state via the LISTEN state. This also fixes a panic reported by Alexander Leidinger. Reviewed by: jtl, glebius Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52934 (cherry picked from commit 8af2f06a99b10c0d3ab9021949e750852662672a) --- sys/netinet/tcp_syncache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 2bb99596f965..1fb6104a2944 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1285,7 +1285,8 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, "segment rejected\n", s, __func__, th->th_ack, sc->sc_iss + 1); SCH_UNLOCK(sch); - goto failed; + free(s, M_TCPLOG); + return (0); /* Do send RST, do not free sc. */; } TAILQ_REMOVE(&sch->sch_bucket, sc, sc_hash);