From nobody Thu Dec 21 13:43:38 2023 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 4Sws8W1p5Jz54pXS; Thu, 21 Dec 2023 13:43:39 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sws8W04Cnz4NkL; Thu, 21 Dec 2023 13:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703166219; 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=VKzpyN7oh/oqf2ROLzVvs8wS1DcdlezGXjPZ2EUMDDk=; b=HrtaYMQabwNQI3fNHTXpVVotxC+mwsohQN9Aslc3m0AaC9hnEhBBGwGwXjB62BxwmMJFML m5UDdubi8ldz2G8jKyoH6xPEwNNih7i3d8t0MTj26P08LdD64Yi9Qbe9Mtom9Wkyhi0I5d qHWv76QgUzvEp+LZPbo4wH79xVJLJfTqHdPcCkwVJQ8WAsPZIFisLymKFufvd3BLsUA0J4 N75MWFYc4aVz1ZSJVmfgKzSRbORfGLKSmM2YhZajKpo0304TpXwO36GpBAf/lSgiQLkUYz AP1T9rpy1z8U9djC8Z7P3GsjPtmXVOd4nCbJa+xU9Ycp+scGdeZFtPW3/UUqjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703166219; a=rsa-sha256; cv=none; b=ZJ8F2R/on34e8MO2HUr9jsXM3RJuTIzju4qN5XVCHpGu/o7gsUyARlVtm4qpoHvqNbAFJt 1RFr1VEQ2ipDnxrm841J38ga0JGEkaRVy220MIcHn8Yo9WHnjU0kIbO+mgsSVyU8MSyaeq UrWdsrs/UW0RWVy6vG51M5wWhq8zvBfWVJ5q2KhslN6EonoEyb5VSEf0yPtn4kBN5D4q7C btVRMz2tsNso5aEoxSx0460LvFOjXbCoSOJcJ8+FobiD5pkv9uV2h3urgQCGQWCLTC46iu jXHJDoODiezwtkvYYkaGS5TsQE18rlyqs1wI2pS1ZugmcdIeSpkIoJYAjDmy+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703166219; 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=VKzpyN7oh/oqf2ROLzVvs8wS1DcdlezGXjPZ2EUMDDk=; b=oHfD+IGg45rMwdM8lnENTP9UtPZGrVZ/5BQ3wLkS/Zi4uzysTymuh6kA1tcyhAWlm8/NtQ OfBXPtU5qaRctD/ZZQykdo+h2YMv4xkkvgJWHEtVaTIIzKGMCDZsks/43vBLalgDbjoFpF 0lahN0XX9EBc2bPauVF5JcrA1boeRFmu4Nxaviw2d/L/ZVwbhCvwH2f2alyp/EiCWJlF3s ZRzrgP/bLeNC1MBf2kdvMkR8FvMbfXMigUFI8GTwO1jQc16zA0X5QXvmvizhVEyNilW26J a1zB4aGXzDvp2vlhbtvA4nFMoRPR1dx13NYBDQ7HBhNHPiqlIwcu996deBdr2g== 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 4Sws8V6FctzZdF; Thu, 21 Dec 2023 13:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BLDhckT079221; Thu, 21 Dec 2023 13:43:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BLDhc5O079218; Thu, 21 Dec 2023 13:43:38 GMT (envelope-from git) Date: Thu, 21 Dec 2023 13:43:38 GMT Message-Id: <202312211343.3BLDhc5O079218@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: 3fab2d96cdd7 - stable/13 - New realgroupmember() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 3fab2d96cdd7f4ce78391ab67f719bd2936bec60 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=3fab2d96cdd7f4ce78391ab67f719bd2936bec60 commit 3fab2d96cdd7f4ce78391ab67f719bd2936bec60 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:45 +0000 Commit: Olivier Certner CommitDate: 2023-12-21 13:37:52 +0000 New realgroupmember() Like groupmember(), but taking into account the real group instead of the effective group. Leverages the new supplementary_group_member() function. Reviewed by: mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40641 (cherry picked from commit 2a2bfa6ad92e9c82dcc55733ad2fd58fd2ea7559) Approved by: markj (mentor) --- sys/kern/kern_prot.c | 13 +++++++++++++ sys/sys/ucred.h | 1 + 2 files changed, 14 insertions(+) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 682754dd7687..e6c11d2ea74b 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1314,6 +1314,19 @@ groupmember(gid_t gid, struct ucred *cred) return (supplementary_group_member(gid, cred)); } +/* + * Check if gid is a member of the real group set (i.e., real and supplementary + * groups). + */ +int +realgroupmember(gid_t gid, struct ucred *cred) +{ + if (gid == cred->cr_rgid) + return (1); + + return (supplementary_group_member(gid, cred)); +} + /* * Test the active securelevel against a given level. securelevel_gt() * implements (securelevel > level). securelevel_ge() implements diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index b17dccada4d8..837c33757317 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -159,6 +159,7 @@ void cru2x(struct ucred *cr, struct xucred *xcr); void cru2xt(struct thread *td, struct xucred *xcr); void crsetgroups(struct ucred *cr, int n, gid_t *groups); int groupmember(gid_t gid, struct ucred *cred); +int realgroupmember(gid_t gid, struct ucred *cred); #endif /* _KERNEL */ #endif /* !_SYS_UCRED_H_ */