From nobody Tue Oct 28 14:47:29 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 4cwtWj63LYz6F0Ql; Tue, 28 Oct 2025 14:47:29 +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 4cwtWj5J0kz3vLT; Tue, 28 Oct 2025 14:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761662849; 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=Vi3D3unhQGOWGL2vrUIi4qrqMeQZyYywSe4FDDHpWWI=; b=xr7/CKsqEbgoU8gIeYq7xsrvajF/+unyVDumKqEAn+bdBzdJ3eM/4YGMV+swO/DFIzkonp z/SJYaDxAXawjrrz2sg/RlqibYCsjGaSgC/Q5QF/X/E9FTx1N9VqAeADUKPEcFS+ZaDhxi qzJmJemLcBe1C4LmUyqoRApR5yQ1G917cHp8m/BaxY0JeVDtlhO9DV9bEIIo8yDx2i4LQx Bl1emDj5mw0kShOZXFCcTmb3kfvoqd5h32G27K21so63h+jOVLx35JB+4DQ7IolYEhGQNg PukvrHOceaBatqjHs6rk7agwdw1lZgAYyUcvpsrGobIyDF9H2HusNoCF0mcAVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761662849; 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=Vi3D3unhQGOWGL2vrUIi4qrqMeQZyYywSe4FDDHpWWI=; b=ugzm86FCGqM6ux9WRd1Ne2pKitOjqrWmkuO/uHaalhD9CnK+euvuyIgTqzrp51HasuuttF k9ikZpcKpHCMIaCKHNebLALrcNOZ9RcJ9Q/evuK/x5zQdmgTszO8VNSNvBEZ4Lpvoo9Fnk H5SmGRkDz0pq38X8sj0gLNrE0ATfaiY7Vy5Nc0B2eK0IZYkKJgaPX87j+WIv5npF9WHN5d YngjVGDyrRXMVqjsua4qNpyAEnvGjGVG9bUeKA8lqqY51mptYIMtLVfTE5YuMAUkaqt5Wf 73wB1qluVLoewRFV0mnJ30P+13CF0b0w9nP9+ceXTuxfv9JKrALoxhMXKA5Jgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761662849; a=rsa-sha256; cv=none; b=RfvZY4KFIROwK2BWN0Us5vtj8ppYEf3pqJez4woBQ1ZfHWEQDIZeL/qiH1gy3mSpdE7DtH MlVdjuK6Vla1nI0wUtm+Mk41fWbkJw1foiBlqiMbQzNcSHiFP9WqQSk0p5Tgr2hL75Qqbs iliQdOUc+z+n4ziIH2AbSnCVpp35ej9X4hpDAC5b30lxoqy0kCntuUTAuiva787JKOerrp TqH/zFB9FXkTscxn8N9+yI0JQeYI5pR8HDT4EPb/gIkBeTAl4D7o14K0WviAQ/YRQfFvWu x+Dy7Dsd9nNPc/wa0/JkLZlxGO1GvzAU3qXL1n727COA7daLksQcAkwmF/Uwog== 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 4cwtWj4J8Yztpd; Tue, 28 Oct 2025 14:47:29 +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 59SElT9h023106; Tue, 28 Oct 2025 14:47:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SElTcu023103; Tue, 28 Oct 2025 14:47:29 GMT (envelope-from git) Date: Tue, 28 Oct 2025 14:47:29 GMT Message-Id: <202510281447.59SElTcu023103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 4672adcea4cf - main - nfs_commonsubs.c: Add a sanity check for nid_ngroup 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4672adcea4cf3c0c626d186f1f41c69552d915f1 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4672adcea4cf3c0c626d186f1f41c69552d915f1 commit 4672adcea4cf3c0c626d186f1f41c69552d915f1 Author: Rick Macklem AuthorDate: 2025-10-28 14:44:14 +0000 Commit: Rick Macklem CommitDate: 2025-10-28 14:44:14 +0000 nfs_commonsubs.c: Add a sanity check for nid_ngroup The nfsuserd(8) daemon passes user credentials (uid + gids) into the kernel for users and groups identified by name (received from a NFSv4 server). This patch add a sanity check for the number of groups (nid_ngroup) passed in. It's only purpose is to protect against a bogus nfsuserd(8) running in a jail. Reported by: Ilja Van Sprundel Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53389 --- sys/fs/nfs/nfs_commonsubs.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 8d506a5643a9..8e1a26eef354 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -4192,10 +4192,15 @@ nfssvc_idname(struct nfsd_idargs *nidp) nidp->nid_namelen); if (error == 0 && nidp->nid_ngroup > 0 && (nidp->nid_flag & NFSID_ADDUID) != 0) { - grps = malloc(sizeof(gid_t) * nidp->nid_ngroup, M_TEMP, - M_WAITOK); - error = copyin(nidp->nid_grps, grps, - sizeof(gid_t) * nidp->nid_ngroup); + grps = NULL; + if (nidp->nid_ngroup > NGROUPS_MAX) + error = EINVAL; + if (error == 0) { + grps = malloc(sizeof(gid_t) * nidp->nid_ngroup, M_TEMP, + M_WAITOK); + error = copyin(nidp->nid_grps, grps, + sizeof(gid_t) * nidp->nid_ngroup); + } if (error == 0) { /* * Create a credential just like svc_getcred(),