From nobody Tue May 19 14:44:07 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 4gKcr81wf1z6fJ8X for ; Tue, 19 May 2026 14:44:08 +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 4gKcr7754Vz3stl for ; Tue, 19 May 2026 14:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779201848; 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=pLepbZEFafZkjf6V/dYDcXZmc1MQCaqesEjpCYeSzAo=; b=p6WEyZyuj0N2RgZYsarR3bmRkqbk4HDwEe6fDTiYk4rHZT+7IH3dhesb98T7pgt12l2hHv xpsJZewwKnUSnvBcbKSoVBferjQFPRwpf39tGBL1M3ZZczlf3P4dfQIqYK2CD1i0ARbFCh 79qeg1VJOxEn0IHWBEjn2Vg/2LA1B7O9+nplIEEStazNOvFap5Q2qOS7OLrzv61cUBPmKe jDf861t4g8vJa4h+6IZWQAPtiEaoWu2zMCZM4hMA6NOltHLiIkoj6xfT/jAKg3ljNZ5+Ki bvCn03HO/A4k3YTTYYzQJAq3Gqo57x2VB1FCqX8JS5LkOFfxG5+AvECbvkIlRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779201848; a=rsa-sha256; cv=none; b=b4n3cHbH19cUs6+BgTcJgBqm1hIK/NZ58WpwdroCK4bkI5NuyVlgWeD6MUHQoF/5yJppfl c7tz+47YfMf+IyPsAxYl0tbjJc6rupi5iFQURlyzXSS3qusuJQrfbKCWMTlK1DMc6fmMek 3FpcKCZOkWWFSW+lI+NS3WZJvh0OB6YA4xD+86Wn4h5O45x/J9H5nE/GFkBHIAjuAwniJC qcHOr4L3NiRKsG2bv27QD/z1J5N3s3uwMZl6mFc/9shyRrgr1QacWZQhAZjvXyltr22BDA l24wc+zoKlpyzRMKioJfqwoSiHlFwNDVG4XsLBnUMMaBajJFEmCryeemlOZsBg== 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=1779201848; 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=pLepbZEFafZkjf6V/dYDcXZmc1MQCaqesEjpCYeSzAo=; b=FG4YZcjyGa4QeCnQqcQ0biBi4Nw0psrq0nLm3IQpgteR1HRISaI52m/T75cEhsfoei0Ixf 6VbBSWsigqz9HBbT8EyGCNTOIzrcYLN4J+V8PPtG5aW9ADwdkf9L90nColwCl+JrLbl9Ea bwmkYRff9ARyRYACpLXzxqxLxgq5BWHoaeZZ87/Y3tjhjHbv1U1FikR6elNQxZdwVOymaU hrAZOFB/l6ZYyoEAtxWoNwyV8UCJGvbqAOHrGZ4H854EdPug8cePZyigoZQBA2txrTfqlp cHF0V9Fe9qN15XayJIbORn8nnzvQYn1Vc8PJ5TMhocMebAy5BbSnFPG6VCR1qA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKcr75z7sz3WB for ; Tue, 19 May 2026 14:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ecd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 14:44:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: ede0f15e03e0 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: ede0f15e03e0a172493cd20d1dd2d88b1711156f Auto-Submitted: auto-generated Date: Tue, 19 May 2026 14:44:07 +0000 Message-Id: <6a0c7737.3ecd6.2a5c0e12@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ede0f15e03e0a172493cd20d1dd2d88b1711156f commit ede0f15e03e0a172493cd20d1dd2d88b1711156f Author: Michael Tuexen AuthorDate: 2026-02-20 21:21:37 +0000 Commit: Michael Tuexen CommitDate: 2026-05-19 14:42:59 +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 7152e8ad600c..9a227218c525 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -579,7 +579,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); @@ -623,15 +623,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: