From nobody Thu May 21 21:21:54 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 4gM1ZB4657z6dyhc for ; Thu, 21 May 2026 21:21:54 +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 4gM1ZB1QFFz3D2h for ; Thu, 21 May 2026 21:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779398514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BKM1qij4T0viRt9cOyGNjSPH0p6RHfd4DumCQhtKtwY=; b=Sg9Jyd40jSGHSZZD8OLcGQLI4dH6qeyKzBu7klEkX2Juthj9e2x8hliCpJnghjiTPlOLjj SdbMexVDgpyU3iiIOUs12bY77si6ItX7au6N9AKmDdSN/1VoqBwCgC/bbbBzcoIYybARk9 lM6blAqJCXPlsOMqnLoUWnZw+J4GYOI9jKvuyOKPHju68di26Ab1Pixont7pZtj01K8JZJ X7TMnIY4ObfmQvAI3wLbyJ8LzILvQPqTYDqO8uYkIgokKSAyFdcqg9K1DtW5dNDF+1OSyI WHJSQtPmMrAI5zycYOxD1PXoIJVexZLLFU0+n320noev9i2S1xh+yyIB1FkOmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779398514; a=rsa-sha256; cv=none; b=HKjFd/qcpPvecgOrVnuESV5Zcu/WnoRJKMx6T00hz8wadyx8MJyXWuyb2ilL48ECPZfIFS VuYcPt46DJs1JY4IWJ5n5dEDuucnOUX47Q8OOCcOacFWyTJmG8aNTstvovdKMLWEqGZtzI 2JzGPU/J1/cyTBkf6tq642N/ECypXmybgZo0lkVzbjz+zi3y4/QgAxkda+vcrT74Th9uwN dNIYo2nI8vJfkbhd/GsWTSi9xsjLkpfnj9W/lSpCJrg9WUF+Ip85NmEtIHgYLTzg5f/cIf PgVTkgjRTITbIGKHWaYVJsPl62k66y4qu6ZSdfsrpMP6S4yrSELRTQnpk++d9g== 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=1779398514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BKM1qij4T0viRt9cOyGNjSPH0p6RHfd4DumCQhtKtwY=; b=szmv3botQgFPWTYBeNaZbWa0B5gAQd0HNtqOyW2Wk/eWpAp5X9unQBY6zHE/mCA3IIWC3L pSw4TUfxSnitWy4941dKnC/JlzuJA+DWmSof39pVDsHpR1VcPhs8YsRTg3xRGRE40s+ZL6 jkJzsamSahrYLpHOAWt6KuOhKQHJUMaiYKMkGMjDTOvO9NKmO3hccXeFGXdV5AfCRhM6NH xmEf2/1xIPQAi43pzGCIThEYlvchai3PPgw6UJXlG78QG42RJATMDdRtVs0LdupXccCU2f bApgdKc6WUqE6lU/n6M5+2/cPEqZCcJ2QKU4pZ+oZuvO3HUjzB63FlfLVcfk/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gM1ZB0rBLzqQt for ; Thu, 21 May 2026 21:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c590 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 21 May 2026 21:21:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Michael Tuexen From: Colin Percival Subject: git: 8562c6727343 - releng/15.1 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 8562c67273436b04ec966e9d8a5a872ea507af2d Auto-Submitted: auto-generated Date: Thu, 21 May 2026 21:21:54 +0000 Message-Id: <6a0f7772.1c590.104fb2@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8562c67273436b04ec966e9d8a5a872ea507af2d commit 8562c67273436b04ec966e9d8a5a872ea507af2d Author: Michael Tuexen AuthorDate: 2026-02-20 21:21:37 +0000 Commit: Colin Percival CommitDate: 2026-05-21 21:20:58 +0000 tcp: improve validation of received TCP over UDP packets Approved by: re (cperciva) Reviewed by: glebius, pouria Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D55410 (cherry picked from commit e1886559ea477add82a0a86cddf728f6778f1603) (cherry picked from commit ede0f15e03e0a172493cd20d1dd2d88b1711156f) --- 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: