From nobody Sun Feb 22 17:46:09 2026 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 4fJrxt3cpBz6TVYV for ; Sun, 22 Feb 2026 17:46:10 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJrxt1Hg6z3twW for ; Sun, 22 Feb 2026 17:46:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782370; 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=W7Z7vfgFc32GChuOPfvRCgaHRD8zZ7FjzOX/iKeFySQ=; b=eH0hGosj7pYI9jsZH4kCKdf51uADkWDOTuUGqXUQZ6dQ01Q0KXEbd4BQZOoy9FdkspUEKa /L/DGUJtRu0R+QL3rcsLfhb/f/0tn3MW8G/koYPby41jexkmWcsKRNgE/vWt77RyBagpQp g7kA9EV0FHgYZSIiDfpY2cOCAwc9CEDHx3K+VpCv7p4iRxysVAg/uWg8cSkwy5ofqRbkpS +08f2Y3sTWRbCSX3RcLbGtX/Yc4RIoJJR0flRsvdf9HiHg710wHj6ihhC7rZSnhb7d8AJd fOCIlE3Fj4znOgTBIQN5U3FaigDwA5QL3f2XG+liMABPb1i1lb3g4Mz6V4rbQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771782370; a=rsa-sha256; cv=none; b=OqKCcx/kD6w2jMye76XJGoOpOQsSbKe91IjZUZR/np7RRRP666KvNF865yCqY1JUjMJ34k eouORrUy0ewSdbv0mUmjPF9omd1xGYsGs12v8DOLcTGrtsMwbnkSVjDfonQ1nMUaZZ7YUw tB7BWqUTwtbq4hRRJRRP0JVoqbWmJhf+h5T/vmqOjC5TyEj9LTTQ9rW6mpIk6I49LXM0jG eSVw6Z3/aCeCugK7KdsivLJc9FAEymRhFe2W8jbH42P2YYY8K/DaSTTobZ9hEngEuRbb3c jKX3eeD522FpR9jfoMzTWhKs8JwNHUXF1fqKcz+GhTbMiPuidnmBRCUfw40PPw== 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=1771782370; 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=W7Z7vfgFc32GChuOPfvRCgaHRD8zZ7FjzOX/iKeFySQ=; b=mX2QJlaxwl/6ioeSQxfsS8t/zaSGPzpMHap4cZxf0Wtwm/+RuN+Fl0Tys6E7AHkyV/JpZi /L/EOYUofIMwpiaTMzzT89V/7ZPzhDCCsLGuOJzwa2FJWC71/lHIrPVbjPYvgoQjBoMEyJ Ohcw9GrBpdZWk7JfGN9L4rnmXcbmlBlrxZtAkgRSwx691vcMZMrGNUhHAZRLgkW+fRSEw7 mBDPeNvOzNFnr/zg3HPJfQvniWBzmpzZ+QTPp7cPQLtBg5lGSRUew+iGunpZFATR4cJGxp fJc5ki3HJ9wDGAtO0+NzLT5PsDjBC/nxWHJEsj/f7FCjXXpyKAyrn0J/8ad5lQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJrxs6r2wzv7j for ; Sun, 22 Feb 2026 17:46:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39fb4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 17:46:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: c984c7593e11 - main - tcp: cleanup 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: c984c7593e11aa95f21f79bb5425a9d5e9181945 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 17:46:09 +0000 Message-Id: <699b40e1.39fb4.5ef58c21@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c984c7593e11aa95f21f79bb5425a9d5e9181945 commit c984c7593e11aa95f21f79bb5425a9d5e9181945 Author: Michael Tuexen AuthorDate: 2026-02-22 17:44:10 +0000 Commit: Michael Tuexen CommitDate: 2026-02-22 17:44:10 +0000 tcp: cleanup No functional change intended. Reviewed by: pouria, rrs, Timo Völker MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D55415 --- 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 6a6eef32e777..c759e9a1cd6b 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -582,13 +582,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); @@ -598,7 +599,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); @@ -620,9 +621,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); @@ -633,9 +635,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); @@ -643,13 +647,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); }