From nobody Fri Oct 31 19:09:45 2025 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 4cyrBx6RhLz6DnrN; Fri, 31 Oct 2025 19:09:45 +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 4cyrBx5dlnz4FGB; Fri, 31 Oct 2025 19:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761937785; 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=HscDk5q0ndjOuggiwwUlaCIznKQKspTL1sAexUkDDn8=; b=ZtEhB1tX7sjoe3YTM7j2t/QA6AwGRnBBODZg3YKm+bMDcI6IvnPfxYCcyCdCNEZy416BtX CcYFFAHgWIdGr65bR12XZm95VPhxHNbMqhxi0W0HgDbx5bltXPiP5fgE6hSLVIwfO1nWFF 6/SOgE4n40q15mfhvZeERa95Ty5iNCGBvzAxK7fAq8qFK/N2TH5KmtIOkiCusUUekAR8oi V3oOc3ak1SaM0ViI5GYm7zG5XxwYXaiEV2PraT2BsG45+01fX2BsYvLUUAKEJZj1IHaFWc NNTETwP1ZOf6IWWWo+n5b0p2X5TG6mGSeQp0iBbBVwk9OSYAaupa1y6ZFu4P4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761937785; 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=HscDk5q0ndjOuggiwwUlaCIznKQKspTL1sAexUkDDn8=; b=nOf/jo1xTlvM3Gd2K3TmpqhD2/sHW5DA68urCBwwhr31LFj7w9oM8KWxAYxCz/0KKbWyvA /AlyCLMAiKbh1CAGJre3xSXZYXnyeVUwYKFsD5awwMnJcH9mAzGzwBg74CGDmyh6fSdrnF JGI7GqbOHSS0uAVpcu46CZcQjUaz3LkW9Z7H/ofE3wlfuux7szVzUeoF/ZiR+GXIFTZWdX QDae+tQ5U2Vu3w6j4KPkbjXQVDGspxtIqMYXaBGa81VdnfG6N+/KJG/cqUBVqRbHIbzYuC QhDbDTKYVD954bT0oY0K8EILPBQUQo65c0Mxn6SBlL/qHB6Pc86JHDdRovlFcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761937785; a=rsa-sha256; cv=none; b=L7v/h6NeTVTWMz//kdpuTokggs4GHwiajo0CIij/P1l/0Wdif+/k7L7GF5EaaEjLW8vBfK VmKGqZE1Sfu4ZaYt4noin9/lBFxHFYJcD2orUvbVybChASfVnEfuigMd2LFpQP593J8Vxh +MfQvuYdd9jpWA2TMoOG0ryvAPlKcbeiNkbHOkOsQREvcrnYGQKjBVih8G7QdRHgnyl912 eGn1sIHfzDYNWBScmqQ9Y7bb7VSCTBqBrOj6qFsfK5AGOpuiw8486kc4H+2ef0N708501p n2eQFVIaji/RYhe4atUJrnbBU9RmlPVPZ4qDKFVYjXIm+wCC5uVkVu9cVAD7nw== 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 4cyrBx5BSpz1KVr; Fri, 31 Oct 2025 19:09:45 +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 59VJ9jaJ062956; Fri, 31 Oct 2025 19:09:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VJ9jgv062953; Fri, 31 Oct 2025 19:09:45 GMT (envelope-from git) Date: Fri, 31 Oct 2025 19:09:45 GMT Message-Id: <202510311909.59VJ9jgv062953@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: c63d587365eb - stable/14 - tcp over udp: don't copy more bytes than avaiable 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 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/14 X-Git-Reftype: branch X-Git-Commit: c63d587365eb1bb434e223ce011a5704be540bff Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c63d587365eb1bb434e223ce011a5704be540bff commit c63d587365eb1bb434e223ce011a5704be540bff Author: Michael Tuexen AuthorDate: 2025-10-23 07:24:09 +0000 Commit: Michael Tuexen CommitDate: 2025-10-31 14:09:14 +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 6829d2a743f2..81b378f496c9 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -654,7 +654,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); /*