From nobody Tue Nov 04 13:24:53 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 4d18MB2l4cz6G494; Tue, 04 Nov 2025 13:24:54 +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 4d18M96bRPz3xqS; Tue, 04 Nov 2025 13:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762262693; 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=8UajqO3iyppJEkyzdOdDzF7pZbjpwT02qskBClikGtk=; b=FNBwYWJFIaodlWu5Tpk1gqH11I0ehFLjwXCGNKE/sEFodbFNU4DVVdNnB6SMphW7qj40ma LkrIHM2EBONa4j+SVeU9k94rajz87q/ImpAZp2GtLe/AzyHcaHTHOSCoeDjVyTZ61f9yQm CRPGNVga1QnF+V3RSfOpKNXquz22IT4fx0fK7OZptAfc4PyTlji2rJld/c17SL3Yda3VUn FtemF+dsvo9+KRZy4dBZM1ztcnPGghxCmN4AWbFtO9S0Dj/6VyWsxbNZb9NdBEEk+qr9SY O/3F8uONU8FJymaW/VaVc1OEqZBX2xdUDN/vhatcs9Jc656F4HIUkkYU9UfixQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762262693; 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=8UajqO3iyppJEkyzdOdDzF7pZbjpwT02qskBClikGtk=; b=Ji28vEVtD6aU7HJgidVShfS1ZOwdkvIpbnwiCReGs2ibZNe0BdCN62E6wlpy9DT8UkLTNP ZbOvzRc1u9pOMDjN5uvHWQGGiW+O9txzbtVDDFgP/K8oTutOm7kZwXbvKU+ehQkC15Iv7I 9pkSw6hB7Y8tNneIHA3WZVWKmTuk2r0IDoyxnV4IZUYHL1uA7OYsihMtsVa/POameiqCJP ffsmB5rGfgh7pfXkRri8ZPFwaRRYy2xBZhdN7VbpSnQo/M6HkdsPRPDyO3NMKXbleS1A4u F7lkiGQixdpdee9jrIAnYrQWHNxEaXZv3w+R/yFwZaqfmr7OD18iPj+QHDFitw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762262693; a=rsa-sha256; cv=none; b=fV9eSfK2fQekYVoXSlU4lclUmZCXSztj9SN1oZcLr0dmpImc37ewpHsY7sFSVCDqMM7Ecu eL05qpwIUMATGJkcg8FJ22t5FsORGBEIGVyxbcq36v8bnuH90O9QWKbkSJoFiaPouCmX0C qlxrqYhzdKd3CZuDY09tZjGdbVaWuTP+/+oS1kWSdU04BIlELBk9of5jZNWkro/vP6+qWE oU4x6p0wg6e80TsxhWumzUtYBw2nj5u8eeDp1jsXisAcRU5uLfae9QlsoyJY/vchS5po/E bmgTYi8wCDWwKaBeGg1c6y1EqHrCwTIEO8Df684ebH2GHpo4Pq8+Eqck5vZB2Q== 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 4d18M95tDxz1027; Tue, 04 Nov 2025 13:24:53 +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 5A4DOrKe071785; Tue, 4 Nov 2025 13:24:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4DOrO5071782; Tue, 4 Nov 2025 13:24:53 GMT (envelope-from git) Date: Tue, 4 Nov 2025 13:24:53 GMT Message-Id: <202511041324.5A4DOrO5071782@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: 763f18140d37 - stable/14 - net: Validate interface group names in ioctl handlers 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 763f18140d37d848aa6647e88f36dc468207c41d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=763f18140d37d848aa6647e88f36dc468207c41d commit 763f18140d37d848aa6647e88f36dc468207c41d Author: Mark Johnston AuthorDate: 2025-10-27 16:27:13 +0000 Commit: Mark Johnston CommitDate: 2025-11-04 13:24:42 +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 607bcdd2aa80..0c7e32e858bc 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -2850,15 +2850,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; @@ -2870,15 +2875,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; @@ -3022,9 +3032,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: