From nobody Thu Sep 28 15:10:50 2023 X-Original-To: dev-commits-src-main@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 4RxH3t3jRxz4tv1x; Thu, 28 Sep 2023 15:10:50 +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 4RxH3t2YgWz3YcD; Thu, 28 Sep 2023 15:10:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695913850; 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=nA+A5ClCaqMbd435ulrTxeYBPqAikLumD6iFCsfPnEs=; b=vullueJjRZb8KXjRAbc4dp8Qh5qUo3hnYHfgBnGAqjDBwfxOiXBVmCAtgN9UpH3aOan4T4 N4Y+CI6wZIivopWDPmj2CuPUGow2ZnmaiyRq3CDBQ9haawhALcbH+xOdWjyrozj0PnD51M kMyQMIpIzSl3FNQl0rBE683LGWDnTjNbAKjYf32bhLu6sJ3u5fpEgDBbJomVa1NI03sfqk hwksV6K0jewKFf5i14pSG+HSi5dfpDc7fTUK1miKMv5blHcP0AfHkd1W6KRx2ghAT8dMzf 6RbfUWEqObQsWbwoejwYhC9PUkjNycAXlWlNkhfefeeb0n4uxN0uzD+RFpF8/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695913850; a=rsa-sha256; cv=none; b=cNFJeltPIZ4ueeEDWnQQDt8FpNKmQrAH7x+uDijqRMdzLnsM3Ix0UobM0y5pITD518/mGo 38n/zBG5xWXl+qSja5hmyihCHkGnC2wv4ipMbhvMcdfjtLrDZ1+7nv3XSw5ZcQbNIGyu1m XRq/eLAljMEX/Z08PRVd2bhLnJZwQQ8aWAGH+8eR+Jg5YRlGAN8Ts4MAyNinRmhUp0zdFf T78h9fRG2A1nDZtUqMYuxMqujxJWIt0+j7B/O474gaE0qstso8MN6NFJ7Ykmdy4TVGcA5+ wlzpdiGJqGhSoDY93XolVYt/WQLnlR5Jm+sqXOlJjP9M2wuomMRrkowMzfEpzw== 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=1695913850; 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=nA+A5ClCaqMbd435ulrTxeYBPqAikLumD6iFCsfPnEs=; b=WiVW11z+dztmlifPyeev4jSa1gVNy2tgsdSch2DgqHw66A4ovGHL7c5ze5NqoCfTr0Ve9y ZSnliMbB3THYeN2GsZomC6hYZgPtovjAtJwM/Wfu8/RuSyJq/W5+6/79vk369UaAen9yMR zm+WClfWUvSoLuOIuT/Sx3xbIOoRrJpgAMrNDY32dPlN1azovKxdsPo6b1zi48FkNgR/oZ oiDa9+Mw0QWe4Vl/iRs9j11i295JecXiLp7AFTihLNLPIQnXDrOVuXgxFTslmn2zI6qXW4 ZaM5jhwt0taUXI5wqP2OMSZwU34hIyd+U5Ip2jEiIe4hL8Or1z5o2IbGpKMzCg== 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 4RxH3t17pVzC6P; Thu, 28 Sep 2023 15:10:50 +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 38SFAob8047788; Thu, 28 Sep 2023 15:10:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38SFAoEA047785; Thu, 28 Sep 2023 15:10:50 GMT (envelope-from git) Date: Thu, 28 Sep 2023 15:10:50 GMT Message-Id: <202309281510.38SFAoEA047785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 2a2bfa6ad92e - main - New realgroupmember() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a2bfa6ad92e9c82dcc55733ad2fd58fd2ea7559 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=2a2bfa6ad92e9c82dcc55733ad2fd58fd2ea7559 commit 2a2bfa6ad92e9c82dcc55733ad2fd58fd2ea7559 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:45 +0000 Commit: Mitchell Horne CommitDate: 2023-09-28 15:05:46 +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 MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40641 --- 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 cbaeb1a50814..b62a5e9ee20b 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1316,6 +1316,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 eb92776c158a..633bf436fcd4 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_ */