From nobody Thu Oct 30 14:14:56 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 4cy5jF3sZDz6DHD2; Thu, 30 Oct 2025 14:14:57 +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 4cy5jF0ZzJz3TTL; Thu, 30 Oct 2025 14:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761833697; 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=SX3H/+p2gBWxq0bhtlOBOyZ6KkWTrhGeWA1O2jm/4iY=; b=sB4wjFZ+F7v4nTwJfZPUJc0YDMk5SONhwXfGon8ugSI1qxwNLUCE8uiFFLBd0irwQjqj4m 74Nk8UKawybJgJQwUVasaKIWF90EpYqVWBGUFvDBgfuYkKZOfjMfKEbmp0gY/Mucw7MY1R tOheQs0HM2q9aX5YCTMFwvaxLIyGTtaAqdGQjXX+VurL/Umbzwpypj+QLnISlXUc0HWG+U KW76plr1/vGsW+hnOZfpQK0A8T4Ew0jNXwBpi36ls+rRua00JJPJ9TJnx0ohUF9BrrOY7b Ci9dARFK010/eOe0Mtu+KG9A/TTWrw4VQP+dFY6FJeTtIoo1g1Gi4z5cpw+7VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761833697; 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=SX3H/+p2gBWxq0bhtlOBOyZ6KkWTrhGeWA1O2jm/4iY=; b=GQiGp60rcOj2czGm6UsMZFQkVQzqgkFoSLyyRpi6uKdcdpPjeVP4kCdZFKCHQvB+qjGx0Z nStDcrrz2sRrdhULrBkjO8ToFLP+jAw3KgJWFz5iTwCHyGRJwCF/mMWxM+pD3FD97bleIB 9S7sO4IvtD61nf7I1AcMbllZEA+wQex1U2vRYpDWR15kI5rLKo3K8YNlO3Qty2WUx8lYpN NwDPa3y4vxO73KuuxGDfz8y9LwsazmODKXfNz/U1OyP93vJ+raW3ZsMfaDTo5YnxT/1IHO +AtMnR3wyANwV24dsQT3uOO3ihxD37J+mDlNEB7895TRZxp5ngBKY73R5blnBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761833697; a=rsa-sha256; cv=none; b=FDn1N4kg5lzuNf+U8CrncQquleorGliQO5SruQNEORpRlFp1UxHbjJGLKUE4EbWF3eb0zb FisnQ4iujiUTc+6dY3axeyzBn5XOa3GfEw65nhN3y6PCc31cMWsElceo8WtNSuk5vYyRbt 6AejREJQ8uXaUyGvE0c3QHWQzkXcmwviRK4J3kgNfuTSnYbjrt+YS/uS4unOp4uwsQ0g16 xAQwB/J49VmAWABi6MZNEOf8aZ+vSOC7nwj50uu+2qiA8SbAy3678rz5KCOVmeAqEqiSIK EzdH/9249l3cdbIKX2+5MflDOex3iCwzcCjiybRdXwDoXOgQ4nf6//adVe5e7Q== 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 4cy5jF0Bn1z9yl; Thu, 30 Oct 2025 14:14:57 +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 59UEEuCT096798; Thu, 30 Oct 2025 14:14:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UEEuF3096795; Thu, 30 Oct 2025 14:14:56 GMT (envelope-from git) Date: Thu, 30 Oct 2025 14:14:56 GMT Message-Id: <202510301414.59UEEuF3096795@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 725ab10063fe - stable/15 - net: Validate interface group names in ioctl handlers 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 725ab10063fe61c07fb37faa1309a7ac1deaa032 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=725ab10063fe61c07fb37faa1309a7ac1deaa032 commit 725ab10063fe61c07fb37faa1309a7ac1deaa032 Author: Mark Johnston AuthorDate: 2025-10-27 16:27:13 +0000 Commit: Mark Johnston CommitDate: 2025-10-30 14:14:45 +0000 net: Validate interface group names in ioctl handlers The handlers were not checking that the group names are nul-terminated. Add checks for this. Reported by: Ilja Van Sprundel Reviewed by: zlei MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53344 (cherry picked from commit 32919a34f17ac1af99dec7376f22a8393c251602) --- sys/net/if.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index b6a798aa0fab..cb9c47c14c32 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -2842,15 +2842,20 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) break; case SIOCAIFGROUP: + { + const char *groupname; + error = priv_check(td, PRIV_NET_ADDIFGROUP); if (error) return (error); - error = if_addgroup(ifp, - ((struct ifgroupreq *)data)->ifgr_group); + groupname = ((struct ifgroupreq *)data)->ifgr_group; + if (strnlen(groupname, IFNAMSIZ) == IFNAMSIZ) + return (EINVAL); + error = if_addgroup(ifp, groupname); if (error != 0) return (error); break; - + } case SIOCGIFGROUP: { struct epoch_tracker et; @@ -2862,15 +2867,20 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) } case SIOCDIFGROUP: + { + const char *groupname; + error = priv_check(td, PRIV_NET_DELIFGROUP); if (error) return (error); - error = if_delgroup(ifp, - ((struct ifgroupreq *)data)->ifgr_group); + groupname = ((struct ifgroupreq *)data)->ifgr_group; + if (strnlen(groupname, IFNAMSIZ) == IFNAMSIZ) + return (EINVAL); + error = if_delgroup(ifp, groupname); if (error != 0) return (error); break; - + } default: error = ENOIOCTL; break; @@ -3014,9 +3024,17 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct thread *td) goto out_noref; case SIOCGIFGMEMB: - error = if_getgroupmembers((struct ifgroupreq *)data); - goto out_noref; + { + struct ifgroupreq *req; + req = (struct ifgroupreq *)data; + if (strnlen(req->ifgr_name, IFNAMSIZ) == IFNAMSIZ) { + error = EINVAL; + goto out_noref; + } + error = if_getgroupmembers(req); + goto out_noref; + } #if defined(INET) || defined(INET6) case SIOCSVH: case SIOCGVH: