From nobody Tue May 19 14:44:07 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 4gKcrF1g4Jz6fJBD for ; Tue, 19 May 2026 14:44:13 +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 4gKcrF0kpkz3sg0 for ; Tue, 19 May 2026 14:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779201853; 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=rPZEkG6uymI+TmEDVR7HM0fAlj698syUZUAzOcnSQ+tgGR3/pBIOy3NS+2zsC9C5FPONpQ oJ4C3U/noE/z2nHR1hag569kXIIhgcq0wd8OA2EXpFmYhMKro5sMQrNpkVspL0gob+BO+f O9tfk04QSbe7mJ3ZmqxzmIp6TxHBq1PoWXRlcLH1uJZ8bjW7yjTifQrPr4u9LaaA4FsHLY TGh7X4khlBE1Cd1nWd1v7IH2woI3eU8XA4rAi+JvEmkG7pqDdtFVPDsyB/dhfsprTz2eWI lrSMCVqh9GLULmLMTnX3e5InXT25uFnFTxliwhpzZ8m31X1dzHWpd0HfSNMAsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779201853; a=rsa-sha256; cv=none; b=LG/f/SuTe5MH4QLRyevZC8w9LK9lArtZ78lTJtMi5nwA+OoMIE4F7WfqB8VCGdybLRJoyo ekZ3+DqR6aN9a01eg1pU4ZKXY/9veGHU9JiK9vCAIOrNtESoe4aYW7sAn/E0b+aIrjo7Zb /d58SvE+SeA2GkDzHA44GTP56hE3A4rKwmSGSm/xRwhxkLiVp2+iVQVd+QA4JmlEYH5ZWF z4LeNYwpuT2v+MMa2GC/2oaN8+G7AE1gq73ngKP8tyGd57FrNbooO3j2PCVQb7DBsPTL3z CNWQ3KRqvQcQgT7iX5XU1YVyFuoFDz5YKUcHWb+PcKl/rxxC8jpUHuLFD+imgA== 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=1779201853; 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=NFDkBR0Mza15A/SDj4OtV9tNcUJDJwQemJWAHMgeFa3J71f+sK8L1qz9qoQDvyh3pt1Dp7 ieQMjk/scYalUnJnz/2yT+Pdxe27xTxi83sK42rC3Cu2F5iGp4uQ0Tv3jp8wqNEMkVwvxd pK2kBHbE+5wTjeu17uJrJqdtqNfNh9GCHOiaaRProd+SsdJ1NpNoNtPOKOm9gCRUhfG4k0 2lWRG0aJFaGYhtx4LpBOMheHwdCnjQaEe3A0F87wCFwbViD2xQSDoknOnVd/eS4ZyABaTC 61HIHAO1O0njXIcLZ8pjRpg9OpQSpYMDmRG5PU4wPdl/s2tP2tLNp+7M670J4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKcrF0L06z4Qx for ; Tue, 19 May 2026 14:44:13 +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: 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: 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: