From nobody Mon Aug 3 15:47:41 2026 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 4hDLfP6h1Fz6mPP5 for ; Mon, 03 Aug 2026 15:47:41 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hDLfP3ftLz3Kcd for ; Mon, 03 Aug 2026 15:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785772061; 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=s9f/UDePz/gW+ITOVCz4qLXBh92xzdmvEYeEhCaH7Os=; b=kt28AIIa4DouhqmK/zF31HJ5S4nqv7m/ynkMoUixwebjHay51LJbeOtM0YlqcAHM+CKIht LuAn/sKp5ka5X2y3iOjdLqOiTvxoTl8nLCF/l6F8k5whxR7+IbsM7KHZWjhnvn57Z+1/ur mQugu5+5WaMbEJORpKrMwsCu5xl1JP2Ud7l+u6EQRyt9HuEOM94O9MiV/DDi+9VxNwMTgX KC4/+ZOiN7wIwi79bG5pPNkn+FWl+xTI4u3RY0EXgMt1L7Mec4kVpTpwOBlLjN6ky6q+uQ vMGSCyKKwv/eBH7vTYA7g76yU/c5SXxoDVZM0YeZRqqN4q/XKEw9v/I5Mx9qxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785772061; a=rsa-sha256; cv=none; b=LLnDX7icQUP0Dn7bm0vZwuLxtQ0c/2ubIkxHZ1e1Kx3dybgQfySWQNz1rDt9ZVWnrFegQ8 E1XDkhw0mVw2O02tStzfC3HTrSDRJV5ItcobFooKiTlaz7Uuhv3/Xv3+U/2kwjTYlt7hMk nWqucdpkrC7+GMgHOTPv6Vy5feS5ZbsHJpWnPR8Imajk4iL8q8UCCMUzDWgY525yvC7UsY XraBeHSJ0LJfElVgwokmz9Zk50p0xMJvaRWHxpjWkclWid666zVvn+2m1eUF2xJHy6eh6o li+luf6R8gUIxGKHUonUIZgwHL/bNVj0WYRYGDe+QcZxOzQRiDpfEFQ2FHVWtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785772061; 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=s9f/UDePz/gW+ITOVCz4qLXBh92xzdmvEYeEhCaH7Os=; b=hXzxky2qD+KL1GPedt7BttTnpGHvQn+13v9XS71ESDs3LfX6V8sg3To2T0PsUSSL2mXn2A ZlVXMvPwBSkPL1V9YY65OoeGy8RCeamHQ7YtbVMoNosdk2Hor92dmvrDld12kdSBe1oHpm vCpB5FKaypnmW+KRoFWE9wN9cyeMifpONGWcell4aLFgZJsUkT9xAySsxj6wFVC2gQdZFO RHJzoj2jMUnINSocLlBxTramkWXpJKacUvTzeFWH6IXI7mufuc0WdhUXy25QoQSZthpHlv exTVn76ofcRDBnbBWjGDOq11aM7J2iYlzLYUjdi0HQ3CRUppnOFmWiXuvRn92g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDLfP239pz16NY for ; Mon, 03 Aug 2026 15:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ee83 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 15:47:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bruce M Simpson Subject: git: 459af94e43b0 - main - netinet6: Fix some issues with passing v4-mapped groups to IPv6 sockets. 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bms X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 459af94e43b0fe2ef91e14aa867c3b1aa1fb9690 Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 15:47:41 +0000 Message-Id: <6a70b81d.3ee83.35062d0d@gitrepo.freebsd.org> The branch main has been updated by bms: URL: https://cgit.FreeBSD.org/src/commit/?id=459af94e43b0fe2ef91e14aa867c3b1aa1fb9690 commit 459af94e43b0fe2ef91e14aa867c3b1aa1fb9690 Author: Bruce M Simpson AuthorDate: 2026-08-02 13:09:57 +0000 Commit: Bruce M Simpson CommitDate: 2026-08-03 15:47:24 +0000 netinet6: Fix some issues with passing v4-mapped groups to IPv6 sockets. 1. EFAULT was happening because sooptcopyin() from inp_join_group() was seeing the user-space thread descriptor in the faked-up sockopt. So, do not attempt a user copyin(); defer to C99 initialization nulling sopt_td for us to force a KVA memcpy(). 2. It seems necessary to byte-swap ipv6mr_multiaddr.s6_addr32[3] on amd64 for similar reasons as to how the user-space initialization needed for passing an IPv4-mapped group address also requires byte-swapping of the 0x0000FFFF field for s6_addr32[2]; it is a direct assignment to a integer member of a struct, NOT a memcpy(). 3. The assignment to imr_interface within in6_v6_mreq_to_v4() was obfuscated by a cast back to its own type due to use of the IA_SIN() macro. Elided. With this change, the feature gap seems to be closed; tested with a simple link-scope IPv4 group under 224.0.0.0/24 with an mlx5(4) SR-IOV VF in bhyve. PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=193246 Differential Revision: https://reviews.freebsd.org/D58590 --- sys/netinet6/in6_mcast.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/netinet6/in6_mcast.c b/sys/netinet6/in6_mcast.c index bc7da2d14a04..036d58e5bd92 100644 --- a/sys/netinet6/in6_mcast.c +++ b/sys/netinet6/in6_mcast.c @@ -1924,7 +1924,7 @@ in6_v6_mreq_to_v4(struct ipv6_mreq *mreq, struct ip_mreq *mreq_v4) error = EADDRNOTAVAIL; goto out; } - mreq_v4->imr_interface.s_addr = IA_SIN(ia)->sin_addr.s_addr; + mreq_v4->imr_interface.s_addr = ia->ia_addr.sin_addr.s_addr; error = 0; out: @@ -1991,12 +1991,11 @@ in6p_join_group(struct inpcb *inp, struct sockopt *sopt) .sopt_name = IP_ADD_MEMBERSHIP, .sopt_val = &mreq_v4, .sopt_valsize = sizeof(mreq_v4), - .sopt_rights = sopt->sopt_rights, - .sopt_td = sopt->sopt_td + .sopt_rights = sopt->sopt_rights }; mreq_v4.imr_multiaddr.s_addr = - mreq.ipv6mr_multiaddr.s6_addr32[3]; + htonl(mreq.ipv6mr_multiaddr.s6_addr32[3]); if (mreq.ipv6mr_interface == 0) mreq_v4.imr_interface.s_addr = INADDR_ANY; else @@ -2333,12 +2332,11 @@ in6p_leave_group(struct inpcb *inp, struct sockopt *sopt) .sopt_name = IP_DROP_MEMBERSHIP, .sopt_val = &mreq_v4, .sopt_valsize = sizeof(mreq_v4), - .sopt_rights = sopt->sopt_rights, - .sopt_td = sopt->sopt_td + .sopt_rights = sopt->sopt_rights }; mreq_v4.imr_multiaddr.s_addr = - mreq.ipv6mr_multiaddr.s6_addr32[3]; + htonl(mreq.ipv6mr_multiaddr.s6_addr32[3]); if (mreq.ipv6mr_interface == 0) mreq_v4.imr_interface.s_addr = INADDR_ANY; else