From nobody Tue May 19 14:57:41 2026 X-Original-To: dev-commits-src-all@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 4gKd7n39kFz6fK1p for ; Tue, 19 May 2026 14:57:41 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gKd7n19DYz3vQc for ; Tue, 19 May 2026 14:57:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779202661; 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=2oJn87ENYuoNUkNA+vofyLWzrlG/aGHq3bDj1I66qCk=; b=RGIWY0Aa+0mYdUYyN5O2e29pm/vwtu6Jl8ZhT9WtEtcJ1a53dUN8fXF8NkjVRRn/W3zlHM Yn1h9ziHAy5xngOQe9mVGDqoVZOhFDsSdJARKBT94pfXTf3Ist/C9V43ks6oXgH/XXTWuc 5OsRJ43dR+FIdid2gTC1YAKxZ4f8EJM94aVuV9VTw0rUM/fvUVqodv0oGyQEYApbjPh5I1 HSi2iQhjWHkW4J1s9/ovg9/rxD4e+XzzAiC+vUL1m6Zu6cDhBUOPsYz2c3qiBg/o94VqpF yjeQGaoNL98+T3CRnNINGTQkP+MURqEOeE0Dgqb+ZbPKZocRRQ8hmmOco6/bIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779202661; a=rsa-sha256; cv=none; b=KuuT4V5GSTncl+zJNXvMOH/xJ6FYPba2VP+QUX65MCoaAGs5xu2lDvg4TVuvGWEDOeag77 TybrGXYvwdPMupI8tMcytHFeGrmhnMTCvSnJb+o0afmA1Is80uZxSn/9YrB6pduUTWsth8 tym1eEVS5NH2ay4BN5xh2YhvETKo/Wsu9GBWolwkzJTSLuvAWZYccbR1D1at6ug2yjpedc dGl4g1Zqa5QFHb5QLyYc+rGpEUOfqq1mnDthO22Idd/Yx9QFDa8FfPBzvpS7g+TZFVNjag fZ9mczRFK4D+XgC7FZUJDSc2IdI4Wg6Sq/sSV7GMPGK51QjGpVPM/2WdRf2pZQ== 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=1779202661; 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=2oJn87ENYuoNUkNA+vofyLWzrlG/aGHq3bDj1I66qCk=; b=WOXl1Bd74MM0efTVW1yyFiketokBo8aDzb6lw1oHCmwP0YdvLgEjEePz61Kfnh9X4j3Qpt 6M+RBuzuzOgkiosdbd68lOKFGRFcpojQVfRTn8ikdCXq6xtjuC8ESdX3w1yj1u5e4rACVe 8bBxh8AhJH8UOJ17eseazWGIFcxB0ef3uLpEtjXwGDm8KozZs+8ruZYarfGlWm8SKUx+an uFZrYqwZVUEPAGlf89bzbob5rjUiOwS8bFlZrO/M/5O6nn7PCTEfdWjdhvARjPKkYevXHo lmgtOag8cO6VN6/PjyN/qXTUFTAddfxf7RvLV1QEY1ToAk5FDihtdtc0JfG/bA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKd7n0m7Cz4ny for ; Tue, 19 May 2026 14:57:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ef58 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 14:57:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 61c9f9b482ca - stable/14 - tcp: cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 61c9f9b482ca927d3da668f73f434474cd835e31 Auto-Submitted: auto-generated Date: Tue, 19 May 2026 14:57:41 +0000 Message-Id: <6a0c7a65.3ef58.a5e5f45@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=61c9f9b482ca927d3da668f73f434474cd835e31 commit 61c9f9b482ca927d3da668f73f434474cd835e31 Author: Michael Tuexen AuthorDate: 2026-02-22 17:44:10 +0000 Commit: Michael Tuexen CommitDate: 2026-05-19 12:56:53 +0000 tcp: cleanup No functional change intended. Reviewed by: pouria, rrs, Timo Völker Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D55415 (cherry picked from commit c984c7593e11aa95f21f79bb5425a9d5e9181945) --- sys/netinet/tcp_subr.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index ca201d721616..31f52cbebffa 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -633,13 +633,14 @@ tcp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *inp, if ((m->m_flags & M_PKTHDR) == 0) { /* Can't handle one that is not a pkt hdr */ TCPSTAT_INC(tcps_tunneled_errs); - goto out; + m_freem(m); + return (true); } thlen = sizeof(struct tcphdr); if (m->m_len < off + sizeof(struct udphdr) + thlen && (m = m_pullup(m, off + sizeof(struct udphdr) + thlen)) == NULL) { TCPSTAT_INC(tcps_tunneled_errs); - goto out; + return (true); } iph = mtod(m, struct ip *); uh = (struct udphdr *)((caddr_t)iph + off); @@ -649,7 +650,7 @@ tcp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *inp, m = m_pullup(m, off + sizeof(struct udphdr) + thlen); if (m == NULL) { TCPSTAT_INC(tcps_tunneled_errs); - goto out; + return (true); } else { iph = mtod(m, struct ip *); uh = (struct udphdr *)((caddr_t)iph + off); @@ -671,9 +672,10 @@ tcp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *inp, #ifdef INET case IPVERSION: len = ntohs(iph->ip_len) - sizeof(struct udphdr); - if (len != m->m_pkthdr.len) { + if (__predict_false(len != m->m_pkthdr.len)) { TCPSTAT_INC(tcps_tunneled_errs); - goto out; + m_freem(m); + return (true); } else { iph->ip_len = htons(len); tcp_input_with_port(&m, &off, IPPROTO_TCP, port); @@ -684,9 +686,11 @@ tcp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *inp, case IPV6_VERSION >> 4: ip6 = mtod(m, struct ip6_hdr *); len = ntohs(ip6->ip6_plen) - sizeof(struct udphdr); - if (len + sizeof(struct ip6_hdr) != m->m_pkthdr.len) { + if (__predict_false(len + sizeof(struct ip6_hdr) != + m->m_pkthdr.len)) { TCPSTAT_INC(tcps_tunneled_errs); - goto out; + m_freem(m); + return (true); } else { ip6->ip6_plen = htons(len); tcp6_input_with_port(&m, &off, IPPROTO_TCP, port); @@ -694,13 +698,9 @@ tcp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *inp, break; #endif default: - goto out; + m_freem(m); break; } - return (true); -out: - m_freem(m); - return (true); }