From nobody Sun Oct 5 13:25:03 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 4cfjnD1Vzkz69tBh; Sun, 05 Oct 2025 13:25:04 +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 4cfjnD0P3dz3t1D; Sun, 05 Oct 2025 13:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759670704; 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=WLveArdW6txptTqudrihiwx865MNBabrdhn/dmyzOtc=; b=LndEc3jL+eeAc+rLdQL3jej0Lo+UthOs/HFs9pG1RiiIvt6biP4zt0W8eVe3i5q+OuZRrp 9EPAIV0AjTlPPqSFDmhwrGpvEUyWzDoM2sWpFayuuiNurIJCNs5Z2CnaO4Vpd4Am8WnZZ/ x8shO/FSpHud3Bkf7K7ymuKOVMepJJz8JwvFK7A6xpFaxpguu3XI3a0RozbuNPZ/A0YgBd XQLVBUTiCScKld0C8keqqM6Ehj3c1U1PUKDJ+fkqN1QOoAk6BvchKI/O4hawNJ1jjJGMLR Dzg2ZdPgTD7IP2TkY5/LoB2kWq7C7HuJmbQiIr9Rv0OKL3HWGOaiwHNqJT3HRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759670704; 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=WLveArdW6txptTqudrihiwx865MNBabrdhn/dmyzOtc=; b=rBD8tSG6iVbsfUpGNBclbBfqPs6EfDBku65hgWO1zsNT9rfuKpVA+KJfETIO2JrWovjy81 Zs7q/kVj5wwmq4MFiP+zHelfywXKJFiGSnSaYyqPX6CkaPD8M4pc0mV84HlrzsOgLevNE+ mndYZgAbBleJFEUB3Ckbddf3ut+Wln8hdlDrxBR0rnXIgYEt3kZrdTsXWjTnyukEJ4+1gI yyyZt3Ptl+/1+kbJhqMjFOCF4IayUYVi5ieHkC11zRpLBgH95BwgFuWcpHMGDf63TXMBzh mwJj4IGgFo4I9Vcr8kJIvyoysYaI2DhfbGfZhmFeLCEoi/PFmKESbkBE9pjkig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759670704; a=rsa-sha256; cv=none; b=oe8LCkp+cXFN4f5jjImUlZrnAE7/eJJfemjAEcK72Zwxy8wA5KurD6BEf/Jeh/dQLsrotU KBW2HOradNyGbqm5QsitbXUMjEO9VD2zXMoDBb0uz0eFzFy1DxCZNTbJmC5Gfb+bToVsW8 tRk/QjDKYe1EDKmwrMawiWTXq3kBjBvwgk6pkvK9IsOdEopyCzrCHyZe5zQp+R8Zz/5nE/ 58iMxmcGdBeVPnDSNXI2W7JueI2YOCGNWShrsgPW6HKMzuIOIuuoE/aBlKVIpHvpP29kCh nMi9oaD1049AcNxxRVCRfCbmmLJ93fQoypX28F8l093HdNOhhWGy1R7s7zrAvA== 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 4cfjnC75pPzN1; Sun, 05 Oct 2025 13:25:03 +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 595DP3al094060; Sun, 5 Oct 2025 13:25:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 595DP3pI094058; Sun, 5 Oct 2025 13:25:03 GMT (envelope-from git) Date: Sun, 5 Oct 2025 13:25:03 GMT Message-Id: <202510051325.595DP3pI094058@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: b0501abb4cfb - stable/14 - tcp: cleanup syncache_expand() 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: b0501abb4cfb8ffee7a7245ca197d290df912e22 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b0501abb4cfb8ffee7a7245ca197d290df912e22 commit b0501abb4cfb8ffee7a7245ca197d290df912e22 Author: Michael Tuexen AuthorDate: 2025-10-01 19:14:23 +0000 Commit: Michael Tuexen CommitDate: 2025-10-05 13:24:37 +0000 tcp: cleanup syncache_expand() Only validate SEG.SEQ and SEG.ACK when processing a real SYN-cache entry. In the SYN-cookie case, these conditions are always true, since the SYN-cache entry on the stack is constructed from the incoming TCP segment. While there, fix the logging messages. Reviewed by: Nick Banks Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52816 (cherry picked from commit 3034fa3d4321fdc487428c9050711de9ce234567) --- sys/netinet/tcp_syncache.c | 52 ++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index ce2ab29f4008..4ab0d251698c 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1264,6 +1264,35 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, return (-1); /* Do not send RST */ } } + + /* + * SEG.ACK validation: + * SEG.ACK must match our initial send sequence number + 1. + */ + if (th->th_ack != sc->sc_iss + 1) { + SCH_UNLOCK(sch); + if ((s = tcp_log_addrs(inc, th, NULL, NULL))) + log(LOG_DEBUG, "%s; %s: ACK %u != ISS+1 %u, " + "segment rejected\n", + s, __func__, th->th_ack, sc->sc_iss + 1); + goto failed; + } + + /* + * SEG.SEQ validation: + * The SEG.SEQ must be in the window starting at our + * initial receive sequence number + 1. + */ + if (SEQ_LEQ(th->th_seq, sc->sc_irs) || + SEQ_GT(th->th_seq, sc->sc_irs + sc->sc_wnd)) { + SCH_UNLOCK(sch); + if ((s = tcp_log_addrs(inc, th, NULL, NULL))) + log(LOG_DEBUG, "%s; %s: SEQ %u != IRS+1 %u, " + "segment rejected\n", + s, __func__, th->th_seq, sc->sc_irs + 1); + goto failed; + } + TAILQ_REMOVE(&sch->sch_bucket, sc, sc_hash); sch->sch_length--; #ifdef TCP_OFFLOAD @@ -1276,29 +1305,6 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, SCH_UNLOCK(sch); } - /* - * Segment validation: - * ACK must match our initial sequence number + 1 (the SYN|ACK). - */ - if (th->th_ack != sc->sc_iss + 1) { - if ((s = tcp_log_addrs(inc, th, NULL, NULL))) - log(LOG_DEBUG, "%s; %s: ACK %u != ISS+1 %u, segment " - "rejected\n", s, __func__, th->th_ack, sc->sc_iss); - goto failed; - } - - /* - * The SEQ must fall in the window starting at the received - * initial receive sequence number + 1 (the SYN). - */ - if (SEQ_LEQ(th->th_seq, sc->sc_irs) || - SEQ_GT(th->th_seq, sc->sc_irs + sc->sc_wnd)) { - if ((s = tcp_log_addrs(inc, th, NULL, NULL))) - log(LOG_DEBUG, "%s; %s: SEQ %u != IRS+1 %u, segment " - "rejected\n", s, __func__, th->th_seq, sc->sc_irs); - goto failed; - } - *lsop = syncache_socket(sc, *lsop, m); if (__predict_false(*lsop == NULL)) {