From nobody Thu Oct 30 14:10:14 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 4cy5bp4rbrz6DH4L; Thu, 30 Oct 2025 14:10:14 +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 4cy5bp3q9Jz3RnR; Thu, 30 Oct 2025 14:10:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761833414; 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=0WdPYomVzCDfY0tyu7kBA+Sa588XbRtgnCAvg6lHtCc=; b=KUhKKrlWCyMK4E5m1KTlC5sfS2twvRgzM1E4lq4tKIo4VvKkHUV+A0KD5md6SmebSqpvhI JkUWv9TTpX8bhZSWV4mdmYYFuOgyGfXTn3rrYqiQhnzLCl3gg8APu0mpMvEW+U846qtbFU PRrur791xjvIMSfSp14yfR2jVg6X5ASlbWycp+xo0bAwVnFqReBFLPSdkhr1r4wyJW/aJa FDHIJmyytb7JD9LXLsm7qt38XH/dm7y6Cqm1IfqzMDDhg9q3fCNCiXFvBiCeglQF6ibOvO yL0vfn891GSbmlFWd7oyJ1lotPYIDQqoMW50xJoOvdLtg821hgCecFxtILJsfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761833414; 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=0WdPYomVzCDfY0tyu7kBA+Sa588XbRtgnCAvg6lHtCc=; b=YKCksTDi4/Tf48z3qVa0XQVu4INCC8YXcYNJ2tiwqPnq4/U2xBooW27zjt/FXhrTWWQyGR Tf2K9t2qB45xnnWSRhk9S8EnFOyZSOAQXDJ+a3bVX1AlD9yYnq+5XeRePHysEXLfiLUrGg qK1fVJnudLViFl+9p3IS26dHzSfSjSDu6+W+i7PA6wxMih2sqI3Gq684ZpqmRwVE/RuAvN +zHfFzecFuoWzDGHP9igPn/FMIRyS7mfXNJ/kdkyaWb26iP2z0NSJdAWA7/sKYym1e8XrV 6s4f848hctAYS2omvgwc3E4fktbok5zPLn2dbYQ2RWrvxBIwnZZhaY/UnVCqJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761833414; a=rsa-sha256; cv=none; b=qc9eVhg4XAue0TqYDi4W1J7V0LrYeKtwIAc5e8P/s48gtUxUgOChBHRL+2itTG+DsX/r9t sAuWvB722kom8Xse3xwmMH87r/reexQmVGI2UKamTanlgbanALMn9D4TvazrarNAsKdKw6 hS88bT1zBDZR6UgnP7n7XF4ygPhfJDN9JoulOeQTnHvRcVFlVSUa1HMcJ1d8HMNUdzK0pP Air3C4lmIVDJtTrXOxIRixTBxdS3QpB8gZy7rJTaV5h7+yIcm202y6QuHOOjA+ijVVzYm2 J2+FDIZ8xGJfNJFlPV6GVLUGV09HU2vwirOrLqw5nI28LfodzyScE8CIJfsx+w== 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 4cy5bp35tVz9D8; Thu, 30 Oct 2025 14:10:14 +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 59UEAEGl086014; Thu, 30 Oct 2025 14:10:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UEAEZl086005; Thu, 30 Oct 2025 14:10:14 GMT (envelope-from git) Date: Thu, 30 Oct 2025 14:10:14 GMT Message-Id: <202510301410.59UEAEZl086005@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: 4f87ec982528 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 4f87ec9825283e5f3c4eabd31e69acd030236d5e Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4f87ec9825283e5f3c4eabd31e69acd030236d5e commit 4f87ec9825283e5f3c4eabd31e69acd030236d5e Author: Mark Johnston AuthorDate: 2025-10-27 16:27:13 +0000 Commit: Mark Johnston CommitDate: 2025-10-30 14:09:58 +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 46ebabe09a51..c642e99136d8 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -2806,15 +2806,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; @@ -2826,15 +2831,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; @@ -2978,9 +2988,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: