From nobody Mon Oct 6 20:43:26 2025 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 4cgWSZ61T3z6BXVq; Mon, 06 Oct 2025 20:43:26 +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 4cgWSZ5FB6z3MR9; Mon, 06 Oct 2025 20:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759783406; 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=Of/toFp1oRDKtfWh4F1FSVRvgA/43tX5ozpmbi6POho=; b=iZEpb/uksBorjYaurnHvRjvOYu9oQxRK0F3KSpkG5fOPgz33UCN3dZFy+mHyyoa5B1e0uX YDfuxzdGnCs2U/roiaz5KpGMIErFpsfIB6SJm4U1qF6s5y+N5htMFDKpAhW5AKMrW3Itaa zetXdo3x32agJhDPYevT44k2QrDl9mpSw5jyIJKH66zyFS9MgXWGHZtifJbgn7TqjK3Csa Iz32mC9TGLsfMM6C2oUkofmVggUFBLz2nDrZGN/S9ifdi1/LdV6CtdtPRULAwLpAjUhjCP jOmum6XuWbacc2YIiOPTKT6tduHUBM35vbwyl1MNzRpmnopCdT4GyUi6yRpNYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759783406; 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=Of/toFp1oRDKtfWh4F1FSVRvgA/43tX5ozpmbi6POho=; b=qq2O+HgLMuCxGKUF0ypy0fMtV/C1G4Zr9RsA0RLoyrDss0dQCbYyw0//9uiUAT6THLL4FC goV1vTC6YYwsUUgudYq3rPDlgOlGH+5HwBGqFrkt+VRkBppfv7WrmOOnmr4H/ZbHW5WhvJ bj9bTAXNQ/drt0cFWQJBhML0fpAa1XVCSEnSfKXyC+qJjabZgoUUka6FhhLMJ/zkHh8z4d b9ytFlx8fVgwS1S+HNQZc2SQgmIsQi7vwrgu7aB/iC5nDMI8GgjAnmr6KmFV3t3eK48sT5 QLSmv7N5ZvyIBlc3nqdhpJxy6KxqZFTZTjfE2SdXUI4jIk6AKNgFV24Tlsg/eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759783406; a=rsa-sha256; cv=none; b=EhEjl1L9qNO+UgkQNCrw+RsfMrbPQj/ql/a8Q/ciqfH2hXLdlMbsXWQT3hu9qTJFDg0pYX vjY4YqmM+aurJmeP0CVhO2BCMAopPKJcQKb9Hi1eqwnFQIxC2XRdty1D7p4yOQpSM1sPqH TfrLzUSq968lzkK7tfgSnKXMudPOznuTRKs6Lr64xjtpnR8zSCWWvti9ffFlz8f+ucNVHT /HmF5Q1NqkitFpWw7rLEpAUuJtMXTmpLs0L+7ot4m9UA0NRluF0SWPEENNy/o1Rl1gkkF4 vLOJYK+Ub8LYPfblZQKZN0/9y9+X0MX8PipeMQR/TFt3Yg1Kp7RtgT30oCNNOQ== 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 4cgWSZ4fG8zSb; Mon, 06 Oct 2025 20:43:26 +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 596KhQLi050885; Mon, 6 Oct 2025 20:43:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596KhQcu050882; Mon, 6 Oct 2025 20:43:26 GMT (envelope-from git) Date: Mon, 6 Oct 2025 20:43:26 GMT Message-Id: <202510062043.596KhQcu050882@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: 8af2f06a99b1 - main - tcp: improve SEG.ACK validation in SYN-RECEIVED 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 8af2f06a99b10c0d3ab9021949e750852662672a Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8af2f06a99b10c0d3ab9021949e750852662672a commit 8af2f06a99b10c0d3ab9021949e750852662672a Author: Michael Tuexen AuthorDate: 2025-10-06 20:39:31 +0000 Commit: Michael Tuexen CommitDate: 2025-10-06 20:43:11 +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 MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52934 --- 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);