From nobody Wed Oct 29 09:12:42 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 4cxM2y36H3z6DNNY; Wed, 29 Oct 2025 09:12:42 +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 4cxM2y2N41z3xK1; Wed, 29 Oct 2025 09:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761729162; 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=JUbF2XqKI50HGpO8gk3xUELfOYqbUZrfJuxT0PNadWQ=; b=ui4hmdwdNYJc+xzNstITm2guURi+6IaEktJI7+8dskw/L2Ow7Oj2bPA+GiantjXs8Hlhyr c9xoCoJjwM2r7iUSyBSJtTXngfM9pXY2N4xEyqor3LLe8kjbPtklvv4Xm8Btvbq90dgbNf 43Vf+Gg7LCiVOMqVNrKmWLYDMEhszUs9sVA66Hexr7ciBbRd3RtzlJB/Cw4Qj9NZQkGlux Deq8VoRqI3Ss/CRYh88Nq9ruZbiTFzJXVz53pYmiZYRwX8cDaZ4y7+us20310in+rJr36E IZnYg80sM43VMVKW/yuHJBDQD/OYvQYUDRRyxWCRjuoJBIKnuRO3aBvw9BbEVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761729162; 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=JUbF2XqKI50HGpO8gk3xUELfOYqbUZrfJuxT0PNadWQ=; b=i3twH0ZZiNkXiIqMepaeoNZvtWxOCjgUYIZfEY8EsIxq1ejiPL7SacLVksc7CqbZkUvkSW /MZre2uDII1YQB5/oDGOxAL3zzIPrjULZ6o0SosWujJYE+uNe3nzC0Yanz/PA6jgL5+363 VO+RvYazWDqIVnxEiRvoGHGVcbX6M11TqJ91xb+2JaVukuUN9yQThX4nGlpKHOra+uar16 fvIiLfOYt9axRxbezsPxx2vSDrjBnU0V1pqAEdWMkFW281q4KRBPkRAa3zmAA/d9JE0UYt Sm8bviIw50b8fvWnIDxIA3dPboiPGj6/nPlGhOVJvHBkuq85hJwLCfD4IoCqmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761729162; a=rsa-sha256; cv=none; b=sqN/uSUMAfS0VmTybx8JeCjBoG4niBwX9ZQIZfzWLCPTYq41/oZi2vKAow3g5vXb0SRigM MKrdMvQ/lbciaDHyflTLzzlF9tLqknuJ55MaZGXOFMEhEdKpPK+tRKQt3W47+054SpA5tI Ul0QLtoh9dWxuytxDvPOCdCDhl7xwymcueP6u+GibnKzBy2ZtUVgKtk8SqP0IwU9q/xDZt WFQIovmX2E3cY7qgWcUJgZVDBFMUOiIKQkmIkhBn8ma5NMOM+pXRj8kzv491tzZcqaPg9j 1Lf1dHjjF8TMxsVEdzqixx3T6XUqsEqcZpTLpTxvSF/Mdh8nKMrvCk7Sdqwchw== 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 4cxM2y1hjpzVRp; Wed, 29 Oct 2025 09:12:42 +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 59T9Cgfa015020; Wed, 29 Oct 2025 09:12:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59T9Cgfg015017; Wed, 29 Oct 2025 09:12:42 GMT (envelope-from git) Date: Wed, 29 Oct 2025 09:12:42 GMT Message-Id: <202510290912.59T9Cgfg015017@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: e31ff080e5d5 - stable/15 - 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e31ff080e5d55a0f4864177e9fc7b58e7083b095 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e31ff080e5d55a0f4864177e9fc7b58e7083b095 commit e31ff080e5d55a0f4864177e9fc7b58e7083b095 Author: Michael Tuexen AuthorDate: 2025-10-26 17:58:15 +0000 Commit: Michael Tuexen CommitDate: 2025-10-29 09:08:59 +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 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;