From nobody Wed Oct 01 19:17:32 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 4ccPnm5WsJz69D19; Wed, 01 Oct 2025 19:17:32 +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 4ccPnm4ng9z3tqm; Wed, 01 Oct 2025 19:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759346252; 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=WnCzYw07tCbQ6dsekYKO0emhbLGojgqbDFPd6oz7ShM=; b=FJPLvAnRrFm8hCIaE9/c7SvlQdHD7b1S0kTAt5RrVH4sblDXPeAcX9ss0KP8iBGiVVUweY bKWW/2j4RQXEdGRk+vhc8nQ/XsNv5Sa4yUW8LqlxpKkQnYa/NBrRulg48U+zVD59zJLuOn a4srUXkdurJ92YfbVVc7XyHJXZyxmp/l/iKlqOEvylFdKrojs3nY6W84ZRrPpLj6oyFuN4 8kE8aech/VcAXeSj7S+P7htHJIoPOyh4ivkETH+FyjWrL/0DVTJNLenTyoRGsmpH2W1qFJ XSOjvR/6JrGwLX8es+d4sChGBz/yuyy4erObkDxqHJxivOLnDwDyJx1kljf2GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759346252; 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=WnCzYw07tCbQ6dsekYKO0emhbLGojgqbDFPd6oz7ShM=; b=JDsFZODqSiK0Qg334bhDXCcP5fjKBH2oyApZ0gZYSDafOKl2V2ePrK6E/6g0e3kSK04Oiy 89AwXeXEEdWg5kSQHuYMmTUZYHjtWKjXRyGO2PYpst++4xTDzW2+07oMuSA5/5lAguAujQ iQsVwEdYR6J8yAdIJZ824X2aA1s6axxxpdPhGNxwfzwKqy4n6ABaxjOmWNz25T7530V6Qp XyL13z4SFLy/zV3F+sOM+FCrRgjca0OgUtUblln2rvV+Au4jW54I82bVSrhrqrpraaojex S0xwKCvY+E709c0+/7hNQKGtmHnWjzLEoFTTs97cT3zkCAupGoQrU+e0w4wolw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759346252; a=rsa-sha256; cv=none; b=LUSCtbgxVLEIASASHoDahdtqu1WpaubaJSCjAPaEMResXPHJ0AsAPtcq8wRea75V49yBKy N0kXgHOAo2u2F+RohQxUJiwIwQxoGR0II/eH3bI8yN0P2weqGbM+rympotK+phr700g+Ng UM2PXcgiElwvWr+6XzGGyDRnHDO/lJf8pFSmUEPHrmzEDDm1AxEhDl6iz7yRtL8FnY4OYe zamz5mJwu/tYRJ5pmaTGqO26gX7jcIqq+v8mef3t4iONHxc1frJ85lZxNzMNFwb+8+/mvG /Rl1v52f3rzvRRu8nEoEMemSdVUtrI592DG4XMbAgYIjH7cr6MUTSccA+0K21A== 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 4ccPnm49qszbyb; Wed, 01 Oct 2025 19:17:32 +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 591JHWTs019840; Wed, 1 Oct 2025 19:17:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 591JHW5u019837; Wed, 1 Oct 2025 19:17:32 GMT (envelope-from git) Date: Wed, 1 Oct 2025 19:17:32 GMT Message-Id: <202510011917.591JHW5u019837@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: 3034fa3d4321 - main - tcp: cleanup syncache_expand() 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: 3034fa3d4321fdc487428c9050711de9ce234567 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3034fa3d4321fdc487428c9050711de9ce234567 commit 3034fa3d4321fdc487428c9050711de9ce234567 Author: Michael Tuexen AuthorDate: 2025-10-01 19:14:23 +0000 Commit: Michael Tuexen CommitDate: 2025-10-01 19:14:23 +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 MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52816 --- 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 72e9dccea9a5..518cef66e7fa 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1260,6 +1260,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 @@ -1272,29 +1301,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)) {