From nobody Mon Oct 27 16:39:07 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 4cwK2z1mh7z6F3gC; Mon, 27 Oct 2025 16:39:07 +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 4cwK2z1FFGz3qXb; Mon, 27 Oct 2025 16:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761583147; 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=2KxkOUNJiQFzPTem335lSpWSGuwTNCWcRyk276c6mVc=; b=MZN0PX/n7tXhGTkkF2DGoCOMX/ExzJBkk2OATZJnQgBUXP/tA4dhcwpwnuzkylXjQzgcVK SGwezM3LdfCXoDbRJsDOUVFxjVRgz0mDznaHkM64SDGXNwYFDis5h1tQ8wk1yAVmmbGAkO cgp3rpnc/9B3GzUyrpaBEi7qDd4j5k0XCReBnyvqYCHlkwrLXLYKYzxolU7xeWqrRQ7Y1h V77QWVApaK0mEyE/UFQMrZByP4XMa3YaCa4S1WFuoea++3wL2bCsOWckgmWYYzZHQ/AhRS yUpq05yxmZIt6+rtyGUHTDU0yea1AfkLTjZ+jbj8PfAI6gY2FTzvMOjsWl20MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761583147; 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=2KxkOUNJiQFzPTem335lSpWSGuwTNCWcRyk276c6mVc=; b=Qp1f1n+mCi9Dkh1DQ5kem2/gPnAY3l/6jRQjmH60RSHY5GW9YNUNyEPljEesxrnMbc87TC ZAddk0wkOsf5CNvV76SqBkDcref9b8+qPLRd+eVh/YJh3z4qPj+X8wVXTNZLqklY2ZzdtI xcrLBu2zQ/kTBJ8QXHh5mzFtEDCUi9kP0lhvdDuLeKiJy93+87MA2agFAs7WpGTnjYswsz ZO5CWkVyFQQXPMyM49WHM8OuXYJ2of70ddB4hhCpLWI/PDeRH7ZHI4EOiJe38iGILRT1ju ify8k+lt9vOQtDJao7Xm3B4YXwRszfFU8lcgJClLueBw/5Tkuz9j6zdljy9Hrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761583147; a=rsa-sha256; cv=none; b=DZ51B2GteW8OH55O2uFTs568YYBR1ZCwTCgaLPkf49Fs1M7CQV21yQvuS4K5l08iY2eATt 2TJEjEI6cZz+9eLMc/dzhUavUfJBy2i63yGqOzK57N3fX8ltYk8P4I/kkAp8W0DMFKfq0b n3/aeznf6KStXVQ09UJ8YaMorHIf/Fv6PAVwopkPARiICSjEv4WKSQr2MjbTMhKKyDbREn zRJk8pZo+BGgcfg7aXrJnE5HqJZEDNLDPFs7ekMsx6Vw3QpBE+9+F5nlzI1JAXuzWakLNs 7QevxxzQZDoDraXjo7uJRdtyuLkzqf6MikCjIelC3tRJBmbj6s95A8qH+FVYNw== 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 4cwK2z0pYGz1QNj; Mon, 27 Oct 2025 16:39:07 +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 59RGd7S8019599; Mon, 27 Oct 2025 16:39:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RGd7hk019596; Mon, 27 Oct 2025 16:39:07 GMT (envelope-from git) Date: Mon, 27 Oct 2025 16:39:07 GMT Message-Id: <202510271639.59RGd7hk019596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 32919a34f17a - main - 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/main X-Git-Reftype: branch X-Git-Commit: 32919a34f17ac1af99dec7376f22a8393c251602 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=32919a34f17ac1af99dec7376f22a8393c251602 commit 32919a34f17ac1af99dec7376f22a8393c251602 Author: Mark Johnston AuthorDate: 2025-10-27 16:27:13 +0000 Commit: Mark Johnston CommitDate: 2025-10-27 16:27:13 +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 --- 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: