From nobody Fri Feb 20 21:24:27 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 4fHjth160yz6T17F for ; Fri, 20 Feb 2026 21:24:28 +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 4fHjth0RYnz3hb5 for ; Fri, 20 Feb 2026 21:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771622668; 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=CB2TVkaH/8posTH25aI6NwWXn12NIQVWTIXu0da4XEk=; b=WPMNeQ3MRs+PgG8cC/NWcrKgIa0OS1On7w4K2Z+wXYQS/R9KUxzcSm1AZ3B/uobIK55fPU ox1ElxBRIa/GHMHOHe4c0QfiPoRoGAPMv+TyNaeVjLaMTsyINJ7G2/Jht9oUOhrI8wwyoA zVSwUsPOJ73iNo6bT0rFkEfnd3RFwaW+yadpdgstF0Zn5UOJCr9evyBJJaA/AZjDy3SFhp RH0VtHa0EWVGDQJHczRVHch07dMpt/dSLYPxleQC5Y3BXuSnmP/8mwd45McJJwBe05V6RH IOF5yQ1swU9rEOLwf1NKLtIh+NJdniFaqH6s1wmYEldjZLPf6i6c4llYg01dig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771622668; a=rsa-sha256; cv=none; b=nq/cJ8MXoo7oC4ffRAbNWmYxffk7YUCyX3CiCC+VURBbbG+A/9LC3GS7C4nYHIGxzz4eiD VCYJtcdCsY2lV7HGVIC7V6FtA2ddcUxiDW9ocpZVnGIHoWKuq8RS5TMoKu330dsXbh+9sD hUYN/OigCd8z4Q3qZNaAaMc/ka2tMEUuv8IbOX1rB3LWQWPDGU2VOyeSOaYPy5+SyAcIsU 9B9nWL2Ada19WKHosoH/bbLdRXKgl+gyd6Hcq5+ka13CI2xFM8DuTLLAbG9uVnP3nkW27t Udk547FnXdyfm9vEs9xIrgZwoNBG4VqxI0G92lNB7Y9mAW2yAmv13zzlgG/6tw== 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=1771622668; 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=CB2TVkaH/8posTH25aI6NwWXn12NIQVWTIXu0da4XEk=; b=l7uqTYzUHFlt7/E2j0PJK36FEzdh5AIeLrWb3b+hnfzYDsyjXAD2H2kCU7kIiWUWSzuhiP 9O7rNGCm6oSisUfexw5szkIl2j+hv8c2dN4dF0vBDZ0tzLQyBhkuk2zJwHb4aIN5oL+WKf lusleGUxenUNYWPasIXeurKq7BKmqlQSanCzobi1bjzomLe03PTht3pCLYwZpRUqCjQ/eR 6hQ8QCeFg9vkr8Gk0VnGS/qY96mFx7bBerwus/z/sMNTZBltsce7CNaqe2Z3bkae+SYjGF uMo32m8G1mElTg1LRD7w7X1PtKS3T0xDH/StpkmihfmepQvGnji5Xd2jGG6ysA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHjtg6PBJzlpF for ; Fri, 20 Feb 2026 21:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 226c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 21:24:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: e1886559ea47 - main - tcp: improve validation of received TCP over UDP packets 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: e1886559ea477add82a0a86cddf728f6778f1603 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 21:24:27 +0000 Message-Id: <6998d10b.226c0.487f16ef@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e1886559ea477add82a0a86cddf728f6778f1603 commit e1886559ea477add82a0a86cddf728f6778f1603 Author: Michael Tuexen AuthorDate: 2026-02-20 21:21:37 +0000 Commit: Michael Tuexen CommitDate: 2026-02-20 21:21:37 +0000 tcp: improve validation of received TCP over UDP packets Reviewed by: glebius, pouria MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D55410 --- 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 6b0aa76527f4..6a6eef32e777 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -575,7 +575,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); @@ -619,15 +619,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: