From nobody Tue May 19 14:44:50 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 4gKcry2w3pz6fJMC for ; Tue, 19 May 2026 14:44:50 +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 4gKcry170Jz3sdf for ; Tue, 19 May 2026 14:44:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779201890; 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=uIWoLiyF26iqVtOCTIgNdRYfEvyHZ9mQr6mnmHh4vdc=; b=oeNVuOBB/2k8tRtE/G72xQY/mBbYjOiV5F9QiLNZ33O4unVEyVYA9MJpJVR70cIZ4dyr10 To8ULXeNg8gzqkn0Sb257yNPT7I3onYdIUq4rVrMuvimOEH2FYVw+SuNigoto8j/+qjicA Xcw67+unIF2O8EVHvxCpG+2q6rLC9ZA0sFRQHTTgj+V7X4+lNY0xKJn4SmZdHfq/5GTFhk u5IEPkmoCqp1xyG2R8Dcfa7TySzUDk1ffSVHfglZ/MiA2f1lNQQDsRND7sYSKnhJcGIQtH Gr745DsiAX8tok2xoD1ECmiKAw9mCzy7viShKVH3gH77vqetrixs8owH1uzEQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779201890; a=rsa-sha256; cv=none; b=NAzRJjRCUFhADgmK12iLlo7yZWpJChJzS62Qfig1ss2oKsMbHkjyFi9doas163JDTFZoy0 MQWdlU7JJFExf1pEk0OUcrze3HW3WOIEY6i1s4rJT8Wv9Ux8mRqgqslmQgKVoOExOPDDyY sazX23VgPS+Alm5Pd+cr5Ma8m6npXUyHYsULWDt+6W7Zdvqp7Ah9CxK4L/c3z4lhFKr3Al FDJQ24DNZQpqd47pTcP0WzP0+eXdczbGZtt/npKUHiGXP6F14XfzXLmcRl4IJ6lW7eLD9q IXcJIuQNoYp6swZQf8zl8Bwh5Pr16UgvyQT/nNrDvbWnYCVVJfXm6rRmF5prZg== 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=1779201890; 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=uIWoLiyF26iqVtOCTIgNdRYfEvyHZ9mQr6mnmHh4vdc=; b=fRwnreDzHDTB3t6i4iRP0c6Pa97p5Yl5cvdUVRZa2V+FcQOYwka2QEhruOECFl1MUveDGl dEyUeQXumioiT/DTM2kny6Bnq/rEcIfe/4DkLOzZzefaumqZnBDDQ/6cFBCxHsq7C+wGMl Y+H3ILmqJTXdIjgeXsIILH0rDW0zJqcbpQ4et7H8ndQ/xTaIGKywGZzECg56fDCNdoXhTQ VSvhOKGR4dGxLyS+AgDI2Rw+c4gXuQeaJPxABEzVTz+e5YB9AEs1I5U4aowB9jtRTgENee 6UHgu1uYjyoWF38+nP64B0Swuxb41lXRMHE4wOltpQ6L/6lRFlS4jMz9t7Nrmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKcry0kJQz45n for ; Tue, 19 May 2026 14:44:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ee46 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 14:44:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: de69cf1dfd23 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: de69cf1dfd2353c0af8023a094f985ea8a4cf15d Auto-Submitted: auto-generated Date: Tue, 19 May 2026 14:44:50 +0000 Message-Id: <6a0c7762.3ee46.32814345@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=de69cf1dfd2353c0af8023a094f985ea8a4cf15d commit de69cf1dfd2353c0af8023a094f985ea8a4cf15d Author: Michael Tuexen AuthorDate: 2026-02-22 17:44:10 +0000 Commit: Michael Tuexen CommitDate: 2026-05-19 14:43:46 +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 9a227218c525..371158ea4190 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -586,13 +586,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); @@ -602,7 +603,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); @@ -624,9 +625,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); @@ -637,9 +639,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); @@ -647,13 +651,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); }