From nobody Thu Oct 30 04:23:30 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 4cxrZp42yCz6Djtw; Thu, 30 Oct 2025 04:23:30 +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 4cxrZp31BVz3FSV; Thu, 30 Oct 2025 04:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798210; 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=QER1j95L78Q8HDH51geEcb0cJy+gaFNtggjoRnIZPQU=; b=oHyGnWy2AHS9U4fEfjhA9PcSAI3538DqpMYweRVV4gh3daEOzWq9TK/FkVHyAkNxJjUhRh EY5B85lB984LmmpQx34HNFEgsN687cTWqjNbEenxDcp9hKO9RkN/LzL10RsSuLRe2hNREn HfY2U8SHr6qMEAHWPrGGjpp60EesoSj480Nv/DNaSOgV3/tc2fLL9xrAaaqx5GeavIn+53 ZH08abNb3BALd1TzRiluH1OkhcBCA7CprGNHLTVSwdAdlqemJYw2pjGlNXves8KSC9JC8b KI22xp9e9qTl4rOoxrlwwyoyYA7iX9I8bsKVsv5bcPaHWKeQ7vVjbkbRJQCIMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798210; 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=QER1j95L78Q8HDH51geEcb0cJy+gaFNtggjoRnIZPQU=; b=IZ1aztdEnNH4KWGNeGhO41zmhik3HNkrnZgj4KS/fPKTKwmkjIrzmoB7EDj8wPfIic2cn6 eDJctisgCyBsO326lQsN18Rh3Mds/q9VrAiO6PDP9NDuqVvHlIDGHZ1Bq7oDmn2rcvg2QK FOT+dX0ynVs01+OzsHcnq0LQK0LgJZBw6Gt4oTEYA6mK4YsqXP81Asxyf8x6iDiIFiBJ4q NdTRvi4kHXL63ITJA57UrR36bUrfQX/otCAnktTpfRttaW57vSQFxzshMb7ksDkhnA1xmr fa4qNAjAYQN7HkEUqoCUQ0w3qNWQSLI67FnubVAOvwMtLKA08XVCCpyyBS478g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761798210; a=rsa-sha256; cv=none; b=IqFbqgu07vxUSS+6cIdmFHw2B4+fXoeBNzKgkUCzeRVZS3mhuPu3wHm6KWJygkVMWWFeUH X1u65PM3h1xoRhBmZJ3YssI4+mrR/wi+IyAtrJKAZPDnDyY/2VDSeLhRZ8yl67q8Dp2dR6 gv3v1IQSs6FodNjUk0QwRceAO2NC7vzfANouDsqeeEbFHw9QlFBm9X0HfKuNEnw9ft7akZ gnAHYvQyR2ocJi27sISUSe5TbBRO+kSAnbSZ97+9k+DSa986HGqd0jqIBfLGr3amZQ5Tcn 21Iv7pWWSnKoFm/NDFbI6iciKVMqWv4iqv0Nv7U2Pd+xloWfjfrVlZy3wAhhxA== 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 4cxrZp2WT0z16YZ; Thu, 30 Oct 2025 04:23:30 +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 59U4NUun084007; Thu, 30 Oct 2025 04:23:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U4NUrc084004; Thu, 30 Oct 2025 04:23:30 GMT (envelope-from git) Date: Thu, 30 Oct 2025 04:23:30 GMT Message-Id: <202510300423.59U4NUrc084004@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: 54da44487a16 - releng/15.0 - udp: honor IPV6_TCLASS cmsg for UDP/IPv4 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 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: 54da44487a16215f2a03e158412b2c8dcc958e31 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=54da44487a16215f2a03e158412b2c8dcc958e31 commit 54da44487a16215f2a03e158412b2c8dcc958e31 Author: Michael Tuexen AuthorDate: 2025-10-26 17:58:15 +0000 Commit: Colin Percival CommitDate: 2025-10-30 04:22:03 +0000 udp: honor IPV6_TCLASS cmsg for UDP/IPv4 packets Honor the IPPROTO_IPV6-level cmsg of type IPV6_TCLASS when sending an UDP/IPv4 packet on an AF_INET6 socket. Approved by: re (cperciva) Reviewed by: bz Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53347 (cherry picked from commit d3a3854fdc6e8da3bc6c1c13aab8d371445d2914) (cherry picked from commit e31ff080e5d55a0f4864177e9fc7b58e7083b095) --- sys/netinet/udp_usrreq.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 6ce1bcce6fc6..f1d952037d5a 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1208,6 +1208,23 @@ udp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, error = udp_v4mapped_pktinfo(cm, &src, inp, flags); if (error != 0) break; + if (((flags & PRUS_IPV6) != 0) && + (cm->cmsg_level == IPPROTO_IPV6) && + (cm->cmsg_type == IPV6_TCLASS)) { + int tclass; + + if (cm->cmsg_len != CMSG_LEN(sizeof(int))) { + error = EINVAL; + break; + } + tclass = *(int *)CMSG_DATA(cm); + if (tclass < -1 || tclass > 255) { + error = EINVAL; + break; + } + if (tclass != -1) + tos = (u_char)tclass; + } #endif if (cm->cmsg_level != IPPROTO_IP) continue;