From nobody Sun Oct 26 18:00:58 2025 X-Original-To: dev-commits-src-main@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 4cvkvv3JhYz6DhbY; Sun, 26 Oct 2025 18:00:59 +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 4cvkvt4lBHz43B0; Sun, 26 Oct 2025 18:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761501658; 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=7NH2HvUB2OqjayPeShvuNFVUSa/C4GN3gV9pDQVFG/0=; b=k8MkXjvwgOusrgb3EYJSmdzlxi+UHeK5ZGZsLUH7JMdfJA9YDHup9NYRSQKkJ4bdOmhPOv 8YPjYahW0blUz3eORuk+KugOAv/Z4OToW9fUz+InSrjqtnQVcHBcaqpFpBVJ4WAlZyZ6Xq sLSehDlACBHkTvxiC65Mf8OhfzFXS/UDIMapPc9+xsqxofjxm7lODOeu9Fi9RjiLGieYrS wCicBujhJ9TNBlUKmjwX0MWt1RtFW7e83zG+/InWzUcjyjgjmSsy9qEmfj2gbyh1zoZQI1 gGmUX9cqrSv953evlIqOby+jXJKyyLuUOQvjGXZCYNX84B2JIAcMx3KF94bQTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761501658; 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=7NH2HvUB2OqjayPeShvuNFVUSa/C4GN3gV9pDQVFG/0=; b=JipUmRRAjtASeZrMqMyiHoLPJjEWyI+gn3agdsbh5YeNN6dHfK907fN7CsoRcmcIwukFCz CISiY7gjqSDhMXyfqiY8xtb/XZ2gy/67ruA7icxx/vCZnx1xT7Lumv62x1CDtU6zCRwIs+ FL+cYX6ykMjnnBGLfhk1oEgUsVsS8wxOnhDcN/MM2u9ZOpIuIO/jszTkwa/5/vixwFyX63 7a6LrKJ0DuDlTOiNDvyDVEmkRp3Bup9Gs0Yd9ggeLNnTyvchLtoV0dAIprTzjWK+E5iEXG WEKxlU3VP6zd8v8H2lXpEORp+vK4CGQ8CJ5sY+YpvcUchHpxEmAdc0BzRFn9wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761501658; a=rsa-sha256; cv=none; b=gI4DlTvqqT0agNiU4naHM/AJu19lQ0mKDuxvI0xN4NLTrzmD0gJkHscoqWeTefpyzv7E3k X71vkFOVaty7OnN1iTYLvWX5kUWgvVVMKJXU9GMsbc5dtI3D+CwaX3yYIM2Qr3VDDBzT+M yIoCCmDwLmHwuc+nrcPwuzMtiLeRBNdAU76tOLXaGEBXHnMTgqSqaKnH0dE7zuIrC8gbv4 ZA2HTrb2lbyt5GWasYyGusOjGOQMDXm2eaBuSKqpW1FzvsesUA1xGTbTuCbcb1G4syCjQv KoQArBx+kTgkKH7GS90dXS1oe+skPiZgnCVEgWA75XnZvF5kDsVsS7S4VYg58g== 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 4cvkvt4HfQzkg9; Sun, 26 Oct 2025 18:00:58 +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 59QI0wda029185; Sun, 26 Oct 2025 18:00:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QI0wYx029182; Sun, 26 Oct 2025 18:00:58 GMT (envelope-from git) Date: Sun, 26 Oct 2025 18:00:58 GMT Message-Id: <202510261800.59QI0wYx029182@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: d3a3854fdc6e - main - udp: honor IPV6_TCLASS cmsg for UDP/IPv4 packets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d3a3854fdc6e8da3bc6c1c13aab8d371445d2914 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d3a3854fdc6e8da3bc6c1c13aab8d371445d2914 commit d3a3854fdc6e8da3bc6c1c13aab8d371445d2914 Author: Michael Tuexen AuthorDate: 2025-10-26 17:58:15 +0000 Commit: Michael Tuexen CommitDate: 2025-10-26 17:58:15 +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 MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53347 --- 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;