From nobody Fri Nov 15 10:48:55 2024 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 4XqYfc6f0Yz5d05P; Fri, 15 Nov 2024 10:48:56 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XqYfb59hqz4WmT; Fri, 15 Nov 2024 10:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731667735; 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=jrJtVIiL/KwR1ddkyLS63HTzaVPm38hbGLQXpV0MdLE=; b=IWDViOQ8mQyyXcOi9mVnHCnoB1IwpFkRb2rI7iN1Xlll5PYriXMu1sd7WB2JkizSLvWvMd lWGT7khQtKoLuURgiFlF2PRaUBq1XZYMyi1auztJ+kL+ZNLs9De8+uO9ABnbrY3UR6eApU sWTLMim4Rk+q51Mtx4wTzsp0/ENdn5KTehvG2ShqNGSS748Ufz+XVpU387pNtdd8sEg8qx tQR974RcS/TI3CkBUN4MLbGtEImEYX1KsXezvBKjLSLNmFrSpz0iyXGmBNegcP0OhWYVHj SwofqLe8JgMorp0z3Dcvx4tWziQc37CEfu1wwOvtEX9Dz/hJ/KtX0uf9CHAyIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731667735; 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=jrJtVIiL/KwR1ddkyLS63HTzaVPm38hbGLQXpV0MdLE=; b=B1q4lmVEbKdoMokX4bkMoMs0m/jEIFnSO/DOLTQ0hceiQLk2YBTtQy7bf1bbGzq3a44Tto zHw9EToWHq7hSxM9T7U0rgqqc/iHig5rB15I652pPwY5pb8v0NcmEyNkYsCol23nxaBscL 5SBnFnH/iNF+QLDA1wUAyTOc4w5Fu95elMKFK+mrbBuakSTNc2DZ7D9BG3v1mQL2bQQIWX oXvIBwbaP/vZm5ndyuPwTBSd0LDby2XO8++cDsSqKrEY4VRscenwtLnY5Z8wxqwYWeOXmz pE3Y7eEx6AtfNSIsQE4uf2og6NzyHQbRdBKFhxdgtb3ThYx6sje+ElSR14aaww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731667735; a=rsa-sha256; cv=none; b=ybqhHPpBuCNmce0CMlaG1AZNOEB8G57XaveEDOhZRjRtGWfrdgki0gVrq1E6ySFRBHob+U lm+L49GEzYyzwAVvkRm7eYSXAS7Fc/HahPpbHURZGoIJWFI3ac6TtbDaiZJrWAWUuoO3ie nbcdwlLPH0TuKkDPImqtpK3noqKHr8PWxchqmXANu452tnxMq5wE/JbOrhKiLkuUTEMxZl cSZ1aPIeFDl5HAqVudV538VMZOq7lkfl0TNirK1Z7EqTarSPiJnahs3r3cPKGwGoImsdzs HJ/fSy7FcWFhQ1yhVdATlNTNkMqcGsX/ouPNR8+pSX33X7nB9KYjDSQY1f3kCA== 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 4XqYfb4lKYzKF3; Fri, 15 Nov 2024 10:48:55 +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 4AFAmtCw017841; Fri, 15 Nov 2024 10:48:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AFAmtIK017838; Fri, 15 Nov 2024 10:48:55 GMT (envelope-from git) Date: Fri, 15 Nov 2024 10:48:55 GMT Message-Id: <202411151048.4AFAmtIK017838@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 350e2b1940df - stable/14 - cred: Separate constant for the number of inlined groups 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 350e2b1940dfd457abd55bf0ba7c19274491496c Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=350e2b1940dfd457abd55bf0ba7c19274491496c commit 350e2b1940dfd457abd55bf0ba7c19274491496c Author: Olivier Certner AuthorDate: 2024-07-16 20:37:44 +0000 Commit: Olivier Certner CommitDate: 2024-11-15 10:47:41 +0000 cred: Separate constant for the number of inlined groups CRED_SMALLGROUPS_NB now holds the number of inlined groups in field 'cr_smallgroups'. XU_NGROUPS stays the number of groups allowed in 'struct xucred'. The first is an implementation detail, while the second is part of a public interface. All mentions of XU_NGROUPS in the tree have been reviewed and only those concerning the implementation detail have been changed to use CRED_SMALLGROUPS_NB (they were all in 'kern_prot.c'). No functional change, as CRED_SMALLGROUPS_NB is set to 16, the same value as XU_NGROUPS. Reviewed by: mhorne (slightly different version) Approved by: markj (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D46911 (cherry picked from commit 664b9fcb1c051c17ba11d1e5e8a1db9938d76bd5) Approved by: markj (mentor) --- sys/kern/kern_prot.c | 6 +++--- sys/sys/ucred.h | 12 ++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 0430464f6899..dc2ab35dc5df 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -811,7 +811,7 @@ struct setgroups_args { int sys_setgroups(struct thread *td, struct setgroups_args *uap) { - gid_t smallgroups[XU_NGROUPS]; + gid_t smallgroups[CRED_SMALLGROUPS_NB]; gid_t *groups; int gidsetsize, error; @@ -819,7 +819,7 @@ sys_setgroups(struct thread *td, struct setgroups_args *uap) if (gidsetsize > ngroups_max + 1 || gidsetsize < 0) return (EINVAL); - if (gidsetsize > XU_NGROUPS) + if (gidsetsize > CRED_SMALLGROUPS_NB) groups = malloc(gidsetsize * sizeof(gid_t), M_TEMP, M_WAITOK); else groups = smallgroups; @@ -828,7 +828,7 @@ sys_setgroups(struct thread *td, struct setgroups_args *uap) if (error == 0) error = kern_setgroups(td, gidsetsize, groups); - if (gidsetsize > XU_NGROUPS) + if (gidsetsize > CRED_SMALLGROUPS_NB) free(groups, M_TEMP); return (error); } diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index 21804eb6aa8c..5265fa16907b 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -44,6 +44,14 @@ struct loginclass; #define XU_NGROUPS 16 +#if defined(_KERNEL) || defined(_WANT_UCRED) +/* + * Number of groups inlined in 'struct ucred'. It must stay reasonably low as + * it is also used by some functions to allocate an array of this size on the + * stack. + */ +#define CRED_SMALLGROUPS_NB 16 + /* * Credentials. * @@ -57,7 +65,6 @@ struct loginclass; * * See "Credential management" comment in kern_prot.c for more information. */ -#if defined(_KERNEL) || defined(_WANT_UCRED) struct ucred { struct mtx cr_mtx; long cr_ref; /* (c) reference count */ @@ -80,7 +87,8 @@ struct ucred { struct label *cr_label; /* MAC label */ gid_t *cr_groups; /* groups */ int cr_agroups; /* Available groups */ - gid_t cr_smallgroups[XU_NGROUPS]; /* storage for small groups */ + /* storage for small groups */ + gid_t cr_smallgroups[CRED_SMALLGROUPS_NB]; }; #define NOCRED ((struct ucred *)0) /* no credential available */ #define FSCRED ((struct ucred *)-1) /* filesystem credential */