From nobody Tue May 19 14:57:17 2026 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 4gKd7K5tWhz6fK1m for ; Tue, 19 May 2026 14:57:17 +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 4gKd7K49sGz3vLY for ; Tue, 19 May 2026 14:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779202637; 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=jcIY0stQB1nHad6cWRoq0UHBAiTXnP6TXp0amlUA+TY=; b=oGHuUk0QzVkjmixMOSCHmaKZo/Y9XnJTLRjNIkUpM7q2OxHC+gdW3Ht5M0TM5vrTe/uHoY 7jnT3tp9raxemYjjvBxqpLoybVTTurEl8Ppg590KmPA4LG4k4HXcHBFUIhybtkK67LcwYV Td4gdNPxh+VmtsMrEoisGDGHCH8vZuKL+pIsJn+ua5ykDremIUtvHocay56G3pkzVf4fcO rLJr6YuHaxGYseLT2DMPADgmE6QzOn5qAc0EcteyVo8pbiCtd6wWF+J8CGNVmN3/os0yYx VbUekchQpwCk2jzTXXGmeqyA9AkVcBMqQMTtUAZz0tcx/nsOq64ofpAZRMS+Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779202637; a=rsa-sha256; cv=none; b=KssFNkPPIn+KFpVUfx3HQ+ahfwLlvqXFL3JBiJTUM1KSFCZZX4UkmCDLTgyjID526ltQgP s3GAOofB2XVUx5DkLYDYNVHwfxPYkL/L4P44jZ1Vbvzk6OjB87+tEfRBiMWzopCwNUxCzg eWH+b44CdhECHv0FAEiFlQIcMnvxBwMpiDUQ/2f4OUQncP4gB/rvv5yT6HAvdiBQGYUpHD mQiQ4S5CASqa7HXx5vx7YwgJbDFul7+bO/Y4BZHYpKomJx4iDOZFQbyZDTGBQ1uAnRDQKC N4WWiiw9IgXWAA9rqgQ2hGQEXdCXbuwVBeS6mn/FrTnzeMq7z+o3G84G8TLn1A== 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=1779202637; 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=jcIY0stQB1nHad6cWRoq0UHBAiTXnP6TXp0amlUA+TY=; b=dvBAjqr63zf+pWso9yznf3YEdMbYe5gYBBK6K+R9+AUYjU+cyw6yOn2y48Md0yrck1CyoK +pGgppjcs/SE5/BGotpbCj5VH/ituIK4zF1rRpB4TqlIfirSVgSkoF845IVRTyAFkb1D/a f4i4NBr93h9jkf31+qs1sGswWVSiNmZpErp51Xxk+wxEoorsYQx/CqmJong2Tyys5SHZGW Ac8TvNksfUvMM1UsrzQ3xv31HVbQzfIt63wD4NwCT7GgUvCbalozJgBtNJK8/F6S/usi8P JIrbRYp7DGA+Fr/8Lcbw0tABAm8+DYv8JMSS1O5xrqems7p7a2aLcof5WJC04w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKd7K3Rwsz4lg for ; Tue, 19 May 2026 14:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 411b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 14:57:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: efd07ee95616 - stable/14 - tcp: improve validation of received TCP over UDP packets 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 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: efd07ee956162648f6ddb4bfe76b702a51ef427b Auto-Submitted: auto-generated Date: Tue, 19 May 2026 14:57:17 +0000 Message-Id: <6a0c7a4d.411b3.6c0ff332@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=efd07ee956162648f6ddb4bfe76b702a51ef427b commit efd07ee956162648f6ddb4bfe76b702a51ef427b Author: Michael Tuexen AuthorDate: 2026-02-20 21:21:37 +0000 Commit: Michael Tuexen CommitDate: 2026-05-19 12:55:55 +0000 tcp: improve validation of received TCP over UDP packets Reviewed by: glebius, pouria Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D55410 (cherry picked from commit e1886559ea477add82a0a86cddf728f6778f1603) --- sys/netinet/tcp_subr.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index e1346b433899..ca201d721616 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -626,7 +626,7 @@ tcp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *inp, #endif struct udphdr *uh; struct tcphdr *th; - int thlen; + int len, thlen; uint16_t port; TCPSTAT_INC(tcps_tunneled_pkts); @@ -670,15 +670,27 @@ tcp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *inp, switch (iph->ip_v) { #ifdef INET case IPVERSION: - iph->ip_len = htons(ntohs(iph->ip_len) - sizeof(struct udphdr)); - tcp_input_with_port(&m, &off, IPPROTO_TCP, port); + len = ntohs(iph->ip_len) - sizeof(struct udphdr); + if (len != m->m_pkthdr.len) { + TCPSTAT_INC(tcps_tunneled_errs); + goto out; + } else { + iph->ip_len = htons(len); + tcp_input_with_port(&m, &off, IPPROTO_TCP, port); + } break; #endif #ifdef INET6 case IPV6_VERSION >> 4: ip6 = mtod(m, struct ip6_hdr *); - ip6->ip6_plen = htons(ntohs(ip6->ip6_plen) - sizeof(struct udphdr)); - tcp6_input_with_port(&m, &off, IPPROTO_TCP, port); + len = ntohs(ip6->ip6_plen) - sizeof(struct udphdr); + if (len + sizeof(struct ip6_hdr) != m->m_pkthdr.len) { + TCPSTAT_INC(tcps_tunneled_errs); + goto out; + } else { + ip6->ip6_plen = htons(len); + tcp6_input_with_port(&m, &off, IPPROTO_TCP, port); + } break; #endif default: