From nobody Thu Oct 30 14:25:46 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 4cy5xk3knKz6DJCh; Thu, 30 Oct 2025 14:25:46 +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 4cy5xk3GZyz3W9x; Thu, 30 Oct 2025 14:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761834346; 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=4TD6WgIkJtDYHVoFYNvJVV3U5Wn4hJqio4KfX7Vx8gs=; b=jz/sk5YQ1AzsdpfNYr9ackZpGIHTNmgUGjIf6RX+zcqTQ6XkKQ/SJhJHcXQeVpACR9aMko UHd/H0OhOIG3wiPA/Fn3MyICeG3Uos7mth8bpz1S94c5iU8QLq1h0zZyS+6BH5wYcttf0w f7Ete/BQwCZN/G5pb8N4QsEpZcvtEPH6H/gzW7OgqS21mOEbMO4AjGe1G3aRzPFl17QWaX 9HZ9OVS2Mama+EbUjs8qA49T0T1B1ZI0huBrroe8l5pTGC6Z8E0RxJEF6EOUPrmcg4ZKbI zCUhBrsAIGbybC4/DruRgU4uAr8DcpU+10bHIAoyMr5SS/XCIrlogp/y1BzANA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761834346; 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=4TD6WgIkJtDYHVoFYNvJVV3U5Wn4hJqio4KfX7Vx8gs=; b=xWPzq1mt1rMCZ4MITAFoxvwgQBOsceKQwH7As64kp8cYtsYItXzIQAHpdQWFinK3ZwNRf4 gsOA3aoaEgj4N6IWWEsUIJ0bCdoyxslh4dmHWMkWb4HxYXqPoMJ6KHdn7aQ3VCf5bGUrOx GGW0kUbBKsXiwZksj5Zcm7jSqlzC8JvEGGx2XBYAjkwcud4jLftlWDKJ1m33KYtVVC1hax QZCOvb0U7zDzLAU0xD35v2PFrwki1+vQJrScYfyOY+f3eu8HUT+z8ioWonJKCiLmdwzsTE kpn7Xk++JnvKSPEq750Ch/HSo8Ib+9I/hcKh0mT2bWpbhXTWVXUAJgh2wZCnYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761834346; a=rsa-sha256; cv=none; b=Nkuae3wbdYU7lU4tA20fM3hogGz1odIixgdBzShcBP3He54h9sbLUHryUjKl59JdpMlmMC Uj2ilnR4kzbLSWBEY3xKgGCtr/iE6/l9joJ6tSwn3up0ZcXG4SSP1yJNNWcqV5mvqzDBUa jOCEBbwPDGaVkfxhnRsw6upgAISHtcxplFALav+iohouMhodF6h2ETkXrbBR68KUHd7eUe cZcL53l1ojBpIJu+EmLBaOlcZWU6uGC0vjZcN4I/rX4da753c631/BBE1lS4iNRGGlhPtI cavIBqZznZ+a83TwK0IyYOMDWMaY4wtng6av6+Vwgf/OwOdlGfMR5Yg4IL+85w== 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 4cy5xk2nKQz9jj; Thu, 30 Oct 2025 14:25:46 +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 59UEPk7B015211; Thu, 30 Oct 2025 14:25:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UEPkJG015208; Thu, 30 Oct 2025 14:25:46 GMT (envelope-from git) Date: Thu, 30 Oct 2025 14:25:46 GMT Message-Id: <202510301425.59UEPkJG015208@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 9a4da735ca97 - stable/14 - nfs_commonsubs.c: Add a sanity check for nid_ngroup 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9a4da735ca97f87e6b0ef55b6f457197c3abae1d Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=9a4da735ca97f87e6b0ef55b6f457197c3abae1d commit 9a4da735ca97f87e6b0ef55b6f457197c3abae1d Author: Rick Macklem AuthorDate: 2025-10-28 14:44:14 +0000 Commit: Rick Macklem CommitDate: 2025-10-30 14:22:50 +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. (cherry picked from commit 4672adcea4cf3c0c626d186f1f41c69552d915f1) --- 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 bde9be0885e0..6a9a73b40fb0 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -4033,10 +4033,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(),