From nobody Sun Oct 26 12:50:21 2025 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 4cvc1T391Mz6D5wq; Sun, 26 Oct 2025 12:50:21 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvc1T2Y7Zz3Cgl; Sun, 26 Oct 2025 12:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761483021; 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=noKnLa1pyvQ7ZicXTlcQbNRokinvZZ/myDEW/7jWNU4=; b=v2FQ9p7vmPTd8jMC4I0cMLgppwQ3hicqX/G9wh8HMdYfOCHBH8/BQFYC+xca9OOX4cpxOT 4G6gIkCsr4AggBq0cZ79xhyNH8kt+/8G/ECIlm+K3v2xBU2slQ8dm9wPEhdrGz1J6wk+8f UX5av46/pcDVRl2IAOJo6F7lNM/4ejg+7p48uoBhdSij5loG73GAgT/GTtRCIVeMb5TBtd CoFQzELmnMWKpkDD4AtZBgRbMfX8QfyLZJQtCwQyVzI9ZvYr2+DUJPcFuY4n8d/OVfu4yG o1qs+Ln7qvGzlsDSNSeKYQyOEsEp1tTU3Qacru4IntQNddH+yneNlM7KNlV6Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761483021; 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=noKnLa1pyvQ7ZicXTlcQbNRokinvZZ/myDEW/7jWNU4=; b=VGVmEUTiA9NXlieHWx2u/h4k8iNwuWRJglE+AeojYAz7O61c6ij0zcyvdWIxyTdCg18saH oa6mujKVONca5l4M7nlQNdGTcLPaU2tP4inV1ImGX7qVHJZj86ZjF0HA+XrIf9mX6cHH+0 nyOgvPIdELYdZtpVNCRBcYuV+Ljl2SimpXlqd0d99hnX5YuFDKOaTl7K2jFT+cvYPqjkAK Hkk6EIQZFzcIc/QANtkRWg59JglYPR/4BAST7vV59Pw/rLLYrgoxnzoKTWYqR9tzHlcHzO g978T1raZl7M3GICNolHGjwp6pLhM1kFC2edQrhhs8rgERrF1hUQSI3EK+l/eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761483021; a=rsa-sha256; cv=none; b=htZHxJavFFGOFCuFPzYA1ymQSnYbanJ678nuJ/DAqdZglW9hsemun7TuixerdHS+HcjsTN E/8YAQZJ8mJTq4UV1yAyHF2Qetw70agawtuwjSXqttTJgNLYo1QwQ42JsBBskLvMSJqNjb BeYkXEanQsBJPPjZyuVhy3IkOe6Wz5KAjVf40t4KwoSSk17q67F5SqLgsWJJXJT53HF4nq rBlNFlk/JDDQ4wEtyj2tJFy82yYkL7uj4iy54T/C7/FduXyv1/LKXzOrf+PFnFH0eDYM6n 2jSCqc8Cv0OvT2KNekIV60tRJAWueYymwe4vFXQuQHUigymgtTWaN8XyiIr+0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvc1T27gGzZYP; Sun, 26 Oct 2025 12:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59QCoLRF041463; Sun, 26 Oct 2025 12:50:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QCoL9I041460; Sun, 26 Oct 2025 12:50:21 GMT (envelope-from git) Date: Sun, 26 Oct 2025 12:50:21 GMT Message-Id: <202510261250.59QCoL9I041460@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: c566953da83f - stable/15 - tcp over udp: don't copy more bytes than avaiable 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 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: c566953da83f0faf8e335aa7a5e54e48107c7e5a Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c566953da83f0faf8e335aa7a5e54e48107c7e5a commit c566953da83f0faf8e335aa7a5e54e48107c7e5a Author: Michael Tuexen AuthorDate: 2025-10-23 07:24:09 +0000 Commit: Michael Tuexen CommitDate: 2025-10-26 13:50:04 +0000 tcp over udp: don't copy more bytes than avaiable When copying the data in the first mbuf to get rid of the UDP header, use the correct length. It was copying too much (8 bytes, the length of the UDP header). This only applies to handling TCP over UDP packets. The support for TCP over UDP is disabled by default. Reported by: jtl Reviewed by: Peter Lei Sponsored by: Netflix, Inc. (cherry picked from commit bfda98a42027417b2fa74738c63327532013e93b) --- sys/netinet/tcp_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index c817c79881d6..b6f428b279b3 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -607,7 +607,7 @@ tcp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *inp, } } m->m_pkthdr.tcp_tun_port = port = uh->uh_sport; - bcopy(th, uh, m->m_len - off); + bcopy(th, uh, m->m_len - off - sizeof(struct udphdr)); m->m_len -= sizeof(struct udphdr); m->m_pkthdr.len -= sizeof(struct udphdr); /*