From nobody Sat Feb 14 16:03:58 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 4fCv3f1d2Nz6SHZR for ; Sat, 14 Feb 2026 16:03:58 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCv3f16NZz3HYr for ; Sat, 14 Feb 2026 16:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771085038; 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=yVAcoCZ7nvGy8qZtSZ0lzXzPl96uCJrOlwF+difu7wo=; b=oqv+eV93QCRILDKR+AQB6cs2uRi3yMAo23s84kr1nwEBSl3vf/zmcROC6sl8o3UXMkwyUo 2JzdNGJjFjqY1UfQQry5OkNC1+lItAC6NHwQhBd2xTkd5xDdhMwIXna/qecMtHjixM5G/f 1sltxcfIFPYV0nquuFLCcfQsUgjgoKBfsNaxper4NJGX9Bg1KEzkon8Poz8Y348Yi/t2tC wdlpIIKR+TrCT+FKYGVdIIyi8FXJb47gNSjcDqgVYjgqjLvqbyCjL/d6v3NsJD/LHiedCh Yg7Igl1e1tdX1BhaO2kUXcVMhg6FsIhMCCX+DqEkLKv1a/9pMvncVp+BnavvOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771085038; a=rsa-sha256; cv=none; b=UeIVFv4/+80Dz29bTVFHUJZjjipxYsHDguV7ON0/+5oCx9KXSdQBLff3xkTE6mbvi+RupN iILV5Qh0up51XgJ+/DwfKdDJvLQcRo/7tR8Z2oByX+IzbBf1fpRuef0rdmzCoBPymTuB58 x0OfpqOiqsYxZC7QfNTLa285LTCcINYOPFN7s3Oz6YrNIg46uIyEN+Jb4UDAWvtx+O0Lmt HbDOQdN8SpV4bKh1gNFRuuvmEyUomXzbhHizZ/KxqQiHnhjphjln9xB1VBCN+XXW9j71X4 jLwrhWqTKK9gCHCW8S/RavKCxEjuYP1PYhYLxJWovRv7ScTASz1I3vu200ALxQ== 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=1771085038; 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=yVAcoCZ7nvGy8qZtSZ0lzXzPl96uCJrOlwF+difu7wo=; b=yjGV8dBoqPApVhVbGINTDV6FfixRubCL1NeOlsvYCnMiP2s/to8kUBcbHgOre1mTVKzZG2 ayvFdhzf40EuvSSq3tDrLkgjSmPQd28XqO5oNnwdJgOQeBROib2gmck05jX0niaoHGCC3z 6ibDcvyS73q0SU09eoVvn0PmvlZh87OPfb9NEWsHn3QjRq0boEPLVpCJILlL5rUmXIV8/E ruFpwPJMNSdPghFaU/fY3epI0oVjEtaR2T7DVS+6S0AvWAawxrx+ud2XFadAMwSXc/WUjZ Gn7mbSyr3Tj7/37k273hGIoHHuetPMAjFjekouCpu+eSI0tlCQpom9qTX17hlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCv3f05bRzFq for ; Sat, 14 Feb 2026 16:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 235b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Feb 2026 16:03:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bruce M Simpson Subject: git: 79eff4ad64fc - main - netinet6: Return EAFNOSUPPORT for non-IPv6 addresses in mcast sockopts. 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: bms X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79eff4ad64fc445ea78ed733e16482c45dbd5b50 Auto-Submitted: auto-generated Date: Sat, 14 Feb 2026 16:03:58 +0000 Message-Id: <69909cee.235b6.76aa3a8b@gitrepo.freebsd.org> The branch main has been updated by bms: URL: https://cgit.FreeBSD.org/src/commit/?id=79eff4ad64fc445ea78ed733e16482c45dbd5b50 commit 79eff4ad64fc445ea78ed733e16482c45dbd5b50 Author: Bruce M Simpson AuthorDate: 2026-02-14 15:36:47 +0000 Commit: Bruce M Simpson CommitDate: 2026-02-14 16:00:58 +0000 netinet6: Return EAFNOSUPPORT for non-IPv6 addresses in mcast sockopts. This is a non-functional change; it just returns the correct errno value where IPv6 multicast socket options were passed non-AF_INET6 arguments, in preparation for handling PR 193246 with a side-call into netinet as xnu currently does. Reviewed by: glebius Approved by: glebius PR: 193246 (with refinements) Differential revision: https://reviews.freebsd.org/D55233 --- sys/netinet6/in6_mcast.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sys/netinet6/in6_mcast.c b/sys/netinet6/in6_mcast.c index 4075e75eac85..4e770079e64e 100644 --- a/sys/netinet6/in6_mcast.c +++ b/sys/netinet6/in6_mcast.c @@ -1455,11 +1455,11 @@ in6p_block_unblock_source(struct inpcb *inp, struct sockopt *sopt) if (gsa->sin6.sin6_family != AF_INET6 || gsa->sin6.sin6_len != sizeof(struct sockaddr_in6)) - return (EINVAL); + return (EAFNOSUPPORT); if (ssa->sin6.sin6_family != AF_INET6 || ssa->sin6.sin6_len != sizeof(struct sockaddr_in6)) - return (EINVAL); + return (EAFNOSUPPORT); /* * XXXGL: this function should use ifnet_byindex_ref, or @@ -1684,7 +1684,7 @@ in6p_get_source_filters(struct inpcb *inp, struct sockopt *sopt) if (msfr.msfr_group.ss_family != AF_INET6 || msfr.msfr_group.ss_len != sizeof(struct sockaddr_in6)) - return (EINVAL); + return (EAFNOSUPPORT); gsa = (sockunion_t *)&msfr.msfr_group; if (!IN6_IS_ADDR_MULTICAST(&gsa->sin6.sin6_addr)) @@ -1963,12 +1963,13 @@ in6p_join_group(struct inpcb *inp, struct sockopt *sopt) if (gsa->sin6.sin6_family != AF_INET6 || gsa->sin6.sin6_len != sizeof(struct sockaddr_in6)) - return (EINVAL); + return (EAFNOSUPPORT); if (sopt->sopt_name == MCAST_JOIN_SOURCE_GROUP) { if (ssa->sin6.sin6_family != AF_INET6 || ssa->sin6.sin6_len != sizeof(struct sockaddr_in6)) - return (EINVAL); + return (EAFNOSUPPORT); + if (IN6_IS_ADDR_MULTICAST(&ssa->sin6.sin6_addr)) return (EINVAL); /* @@ -2265,11 +2266,13 @@ in6p_leave_group(struct inpcb *inp, struct sockopt *sopt) if (gsa->sin6.sin6_family != AF_INET6 || gsa->sin6.sin6_len != sizeof(struct sockaddr_in6)) - return (EINVAL); + return (EAFNOSUPPORT); + if (sopt->sopt_name == MCAST_LEAVE_SOURCE_GROUP) { if (ssa->sin6.sin6_family != AF_INET6 || ssa->sin6.sin6_len != sizeof(struct sockaddr_in6)) - return (EINVAL); + return (EAFNOSUPPORT); + if (IN6_IS_ADDR_MULTICAST(&ssa->sin6.sin6_addr)) return (EINVAL); /* @@ -2509,7 +2512,7 @@ in6p_set_source_filters(struct inpcb *inp, struct sockopt *sopt) if (msfr.msfr_group.ss_family != AF_INET6 || msfr.msfr_group.ss_len != sizeof(struct sockaddr_in6)) - return (EINVAL); + return (EAFNOSUPPORT); gsa = (sockunion_t *)&msfr.msfr_group; if (!IN6_IS_ADDR_MULTICAST(&gsa->sin6.sin6_addr))