From nobody Thu Oct 23 07:27:54 2025 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 4csd0p4Mxpz6DyRl; Thu, 23 Oct 2025 07:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csd0p3j1Lz3QDZ; Thu, 23 Oct 2025 07:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761204474; 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=bFe19+xqK/60Gmg62Gn8rV+T3jvkEFJTkF4jhb9/HZ0=; b=TMN9ENwUUivf+Nv/kzP6/ZMcHnR6ChubI0HzS1AvBsfDPSSFfK+3/JGE7CWEMZczl3yX+J AXHOvk9AwW1zDr2JP50eivs9tTt7DxbNFZ+FHmLQiCA29agwYYy5h3nxS1j803p9I/XL+Z UNGDt/8RLxLFbHLMugy7gzz4cb77/KTBTyY6dcT1pScPNQd936aj6aQBgDi0nN+YDyKi+g 5Paog70oqH9Hm6jKqF8o/yrHfbmPdRI2XXIyFqbseJKBWTgnc+UJPldbEwSfgSVqOr9Qyj +82sw4EoiA8aG84a950C0bvniPOltWGLm+F/Gw0WrLxfLbkBvuWuxCry5bwO0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761204474; 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=bFe19+xqK/60Gmg62Gn8rV+T3jvkEFJTkF4jhb9/HZ0=; b=uUurG23EM79VRxbQ9/j1+1KWR8emjjl1SUyUMnc9IZ0tvCN8qbjFexThw8iiWL5k56VaSZ CPlDsav3dJZGR8fQ6n+OCoebCAeGx9tNTBy7xJjSX1PCiG2Jw0WCaux4zVcJspBQTZdA+c DJGrhC3KSR1miuXjhbOZakRyzAt3gnuuGevCFjOnm4ZwnVvhZgEUtWam3amLsHwmdWizpn zKoK/znP9ff+ut5SV6C4ct8vYxNzpsIN2jU1Pm7HFyoOxjcWsL2yxdrgcWhUspuJXlR5tc ghFRBntN5ieh/6MA6SmePlbn66CduGRuBgvMpRSqSiGWY5MWl9nfhwDzydcDDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761204474; a=rsa-sha256; cv=none; b=XD+QX1h1lxIbwwr5yypTp0WXec08MjeugATcDTd+hUEyxJ4kMQfkWFt3rv72v+x7eQCEKB MDcI/4o1QCZ1LLJEJ+3cCcicedK54u5nCySHos4Edfxg2KNcGuoeZ6tUc3FlsyjIq4I5/v G7QEs86uqDyT83CoU46URCbtCxGarXEkkqBnvQ2mvRzmNsPspwwyHYVp4WAfRgriADtwAa kluyM/iL3EVNmkv62Bd9Brsb55ticvocjuuXgXxHBBpIFmMncFFD0wK3enw4Yt55Ml/zFE SPZL3GnQVASuw0/mWPrD8n7+ovSdDtoogQzW/qXBZqoecWO40g61RJDKNY+udA== 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 4csd0p30wfz14Sm; Thu, 23 Oct 2025 07:27:54 +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 59N7Rs0s096415; Thu, 23 Oct 2025 07:27:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59N7RsjK096412; Thu, 23 Oct 2025 07:27:54 GMT (envelope-from git) Date: Thu, 23 Oct 2025 07:27:54 GMT Message-Id: <202510230727.59N7RsjK096412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: bfda98a42027 - main - tcp over udp: don't copy more bytes than avaiable 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: bfda98a42027417b2fa74738c63327532013e93b Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bfda98a42027417b2fa74738c63327532013e93b commit bfda98a42027417b2fa74738c63327532013e93b Author: Michael Tuexen AuthorDate: 2025-10-23 07:24:09 +0000 Commit: Michael Tuexen CommitDate: 2025-10-23 07:24:09 +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 MFC after: 3 days Sponsored by: Netflix, Inc. --- 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); /*