From nobody Fri Oct 31 19:12:44 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 4cyrGN55yDz6Dp7x; Fri, 31 Oct 2025 19:12:44 +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 4cyrGN4WW5z4GGk; Fri, 31 Oct 2025 19:12:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761937964; 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=7R92yo21/Io6TBMvuBFrQONm+IyOncNYxw4lGnuLwpg=; b=tGotwb9YR7qo2PjfTIDXXl0Xg0XAZiGK0hJzfiLZrFmBhu7iAYvCFqBqHT3uZa5NJewlSs pBelQ9V/5th64s4AwGmk+I75IrqPxRS6DscjNgHDgTE4j+L4GJzGiMcYKyEGd7LsH714Pg +H2NCT5P2zBJkAEgKHrBec4dur+meE62GdKsb1/sW+DEvYHF8bvVQaa4m/THJWOOMpILtH rCqquXoCtRJvXvUmSjdf7xwtLBakBRnQ0fqxod4PewebISW3nnQqNJi8aSOEKarYTORKqU aQQy5W3WyzYKmxnfNU+xIn1B+ql8w0C7puUfKAMhvZIVGLwlyTtUuEXcNqXdvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761937964; 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=7R92yo21/Io6TBMvuBFrQONm+IyOncNYxw4lGnuLwpg=; b=hdUgg3Kek3ZKufH3Ouy1nSvcoCcpTBObVH5EumdqIFe7uUML6Vqq7ljyFjp86j3rtex3a1 o9sOkdco1J4JwBsZCWTNZfDRDoovF3IDIZ2AtKeOr/fn9CberWwSDj2/Yg7jt9pufRY7Bs 6LEv7/mdYh5VJZAN5gyU2RZCjeUMR89NxB3dQEIiZCUsSM4uXvGyS1FyRiGw/0E5842tIQ ZmxifWfEoVnJ5VSdopohsnS8su2bhTmt4kYpFpkzquMDxHnwaHSPBLutXitbTdiJShC3fi kovZwhMlK7MpshW+c+tc+6UqFSAKr337nAFYlh/woIhmeAQchOuIjD4W1deMTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761937964; a=rsa-sha256; cv=none; b=PMGty6URVAgwxD2+emVm1CA3Q7ZtYKZTqRNWNYQhhCrKElsbAuWybxIcUtTNuBYJmYV4tT Of1s6rR3NS7Q4vxGYbkQgN3ouDn379/1Bn0ZWkx+WZL20axPVf/g9JGaAON58J2YkTE02f WVDwmChs4n2XyDWpQ8w8IZFHTKP64rdMpbuJ/Ndt1TfZ5H9//tnqHlTYVQr6YZFGltDBS9 +SXqxz2xh4eIM9dmHaQq8E0gPbcD4tu8Z39Ud6WOTkhnQ3wPfnAHjTDzP0WmPh8LMYqVE7 B180/L9ExV5RRNTziqOZULLC0TcZPbfF2SO1ystGSFwPsOlQMEFMxZuiQXUmwA== 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 4cyrGN45Lgz1KQd; Fri, 31 Oct 2025 19:12:44 +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 59VJCi8k079668; Fri, 31 Oct 2025 19:12:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VJCiJM079665; Fri, 31 Oct 2025 19:12:44 GMT (envelope-from git) Date: Fri, 31 Oct 2025 19:12:44 GMT Message-Id: <202510311912.59VJCiJM079665@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: 984a58c13166 - stable/14 - udp: honor IPV6_TCLASS cmsg for UDP/IPv4 packets 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/14 X-Git-Reftype: branch X-Git-Commit: 984a58c13166f9fffe1c7b03d89e3f3d790d07cb Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=984a58c13166f9fffe1c7b03d89e3f3d790d07cb commit 984a58c13166f9fffe1c7b03d89e3f3d790d07cb Author: Michael Tuexen AuthorDate: 2025-10-26 17:58:15 +0000 Commit: Michael Tuexen CommitDate: 2025-10-31 14:12:22 +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. Reviewed by: bz Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53347 (cherry picked from commit d3a3854fdc6e8da3bc6c1c13aab8d371445d2914) --- 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 fdde19bc4475..a1000dadf583 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1182,6 +1182,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;