From nobody Tue Oct 28 01:59:11 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 4cwYTD2Rmhz6G4Xt; Tue, 28 Oct 2025 01:59:12 +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 4cwYTC6S9Lz3VVp; Tue, 28 Oct 2025 01:59:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761616751; 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=HA/db6Hhdb6VumjO6laFeWcF8QPkIt0MCgwRTuserG4=; b=wlzIYMjblh6iamiWqEM6nv+cId8AB47LZI0Ep7Spci4Cwv9z2to16jKpN9yZasQaZ4is4i iJXPIfn9j9EA2y2pUbnK9ETW6qJZ9aRnqCWtp7laVc9okn3OVUnWXpIuEUHbN7JoaZVC0C 9UxovLY5vrtsMpdU9egP+cKtBojNd1Iu4toxUgQBZtwiIEGwFYApNDlOGLJgM/59TiyFvi fPBnpkXL+RLoaEDEyW6YhNyh5gKeu7kWwTgf+XLnff/ZPepifmlztDurkx94rm5EB5c+1J mh0cDHM5o/4a36BWCBbdKXI6i7AyHKImzmMjl9h/kSBsyEc3ww6w3K5yY3NQpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761616751; 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=HA/db6Hhdb6VumjO6laFeWcF8QPkIt0MCgwRTuserG4=; b=kAskL6Rv14YUXyfB9opnnrgMOh6O2NFLLYmwevRM4NmAIlQOzlLbyrzWW2uzVB9/V77lLf IzZ+TdxnvSrq0WUk/ki2hXix+UWhRrI9O0Z8fut+JNUfmZP4ItAnBS1fzlPypKRKfLModS 4w/CeeHijgA7OVvFaCAbZEY++52BYoMr4TZrVSzjW8OGXjmtv3wSZGNMfTT+Z0flQe3qZb OhlhcZAWVFy2gBSrCJbmSPM3upeOGobt3ai0dJhYf2764Cg7fp15Y2NbFIBP7khbkxsTEA ecchQt48TZFrAL+ip1GWowH5jHuwJAU/WzYSnVBa6K3VlPAK4tBhO8gZjGy2Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761616751; a=rsa-sha256; cv=none; b=mCyrykMv0KnLGyHZ22sbcRYcFDR4heT5ibpMU7vNngSvabsi5OM9cXyxUX+sKhTGinKf7A CTvyJls7WPbDboB1/S1hjwxK1Z1zjjMb1+aDfRlz6IosmUGX06vpzayhwwoUVfIXm/IKeu Lfp8dMqqeAO87s+YfLYE/cArQFouDJNRh/qTyOFkIDtRax1ZtNl+f4a1ALa6PiXclAE7qn wT14XydGZI+g/soLgbkH/zCXyzh45E44RHdpA/klJeKCoM2ffmo7op7b6dCKySMdR17ppz k6GZoX9Tj4TSL0dQhB36zJaMJGkSpBKzXUkrNqNPjhVv+JpcFuLdT+6D1egZiA== 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 4cwYTC645fzTbr; Tue, 28 Oct 2025 01:59:11 +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 59S1xBhU071775; Tue, 28 Oct 2025 01:59:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59S1xBaj071772; Tue, 28 Oct 2025 01:59:11 GMT (envelope-from git) Date: Tue, 28 Oct 2025 01:59:11 GMT Message-Id: <202510280159.59S1xBaj071772@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: d9f8e8aa11a6 - releng/15.0 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: d9f8e8aa11a611a8d5d7357c8b732aa07cb2b9e0 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d9f8e8aa11a611a8d5d7357c8b732aa07cb2b9e0 commit d9f8e8aa11a611a8d5d7357c8b732aa07cb2b9e0 Author: Michael Tuexen AuthorDate: 2025-10-23 07:24:09 +0000 Commit: Colin Percival CommitDate: 2025-10-28 01:58:23 +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. Approved by: re (cperciva) Reported by: jtl Reviewed by: Peter Lei Sponsored by: Netflix, Inc. (cherry picked from commit bfda98a42027417b2fa74738c63327532013e93b) (cherry picked from commit c566953da83f0faf8e335aa7a5e54e48107c7e5a) --- 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); /*