From nobody Tue Oct 17 19:43:41 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 4S94Cy1zJJz4xvd8; Tue, 17 Oct 2023 19:43:42 +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 4S94Cy16x5z3LKY; Tue, 17 Oct 2023 19:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571822; 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=Oby0n7dnGRaGpY8xeNZ6IKGCkc/P80an+ySDgvCQ3zw=; b=Z2aOdYZqWM+sOVu4FBmzBknQCKekqLRLzNeeTA39Leuq3tgLbAaa0giKIwODh7uf5l6ltk 3f13iJDv2z+wCPZ8G2QyEWV8RogOVCZKJkfT/5GFVwozw7dj7oL/lkT6XibubNUszAIE61 M4gnwpZtYY3POf2Po6nQ07kdGheECOvaBoaIpjWWRD4sllbe8TqMkUHCTI/VQdycCsIHRW PR1jaXODM5ueDsXApGG5vtg32+Y5hXnv3rbvXONykC4YkL2/sB/028xQNHEo0ZlAztERC8 gaFgE8FnfHKpg+o4mUTOw7pY8ItSp7F1yPhikxPfxZvfNiH1QT1h5W7e7yUMag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571822; a=rsa-sha256; cv=none; b=rqqqTXc3t94XnH2q3MhK2JSTYDufHurzx9fJJhtJYwmZIxnHbnUdpCCjFLa9qQp6gMY2X9 UOUBa+CCxj+4C++QOvRKUiQoGM76UqYFgSJAs7TbpBJIKnWlBKz9u4lZH3PHIMAAE6BLzb 6m4qcXIjRfvKJZm3rLFYiyCpx1ATH5UDpKYl1GT6razKgiJzGOYw+AGBA+vzvRDfZosDjR DasZkBihv16kjQmkMfGrlGnBF8gWvN1BtWF9uLxOMT7+667S65D1n2CGMRHshocbx8GZsc rGYruWhfYRRPGeeLaHiyxGx1b1tpC5e7UM1nJv8BPbhSnWC3EdeVluI1hF2/Ng== 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=1697571822; 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=Oby0n7dnGRaGpY8xeNZ6IKGCkc/P80an+ySDgvCQ3zw=; b=Hw6TdMq2mue1REzxmdAMqNNBYbxZzVFfTib4T2pk65RymJ26Mz34aIvjJR6sSwqmGkDOO7 xlAPCJTR8NCNYSI7eDjfkMdzIlOeF1M2MnTu2Gov4K7NzdddMZI07QmxHWh82PKawkvL1t 7pRJSle4EfXUZY8/VY5+SDGR3grRruo007J1Au2BxRRgwd7nNNB2XTpkqM5MUY0GAkRcvr j0n7T15Z98nOrFTct1Wclx3ZoWuebX7OgvxuSfuGb6j+Wxiw0WKeJSqCccV5S3x+J6/f2D 7C1d8NOxGjGx5F+PTjDkcaItWPFzxDNqhpQCE38AONGb7PgMPF3Tlh457TK4VA== 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 4S94Cy0CTDzd0C; Tue, 17 Oct 2023 19:43:42 +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 39HJhfDr013571; Tue, 17 Oct 2023 19:43:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhfuQ013568; Tue, 17 Oct 2023 19:43:41 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:41 GMT Message-Id: <202310171943.39HJhfuQ013568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: b6b76c1c09a4 - stable/14 - groupmember(), realgroupmember(): Return a bool instead of an int 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b6b76c1c09a44dbf9ef1ef8e6b0c3e8204baae7a Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b6b76c1c09a44dbf9ef1ef8e6b0c3e8204baae7a commit b6b76c1c09a44dbf9ef1ef8e6b0c3e8204baae7a Author: Olivier Certner AuthorDate: 2023-08-17 23:54:47 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:59 +0000 groupmember(), realgroupmember(): Return a bool instead of an int Requested by: mhorne Reviewed by: mhorne MFC after: 2 weeks MFC to: stable/14 releng/14.0 Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40958 Differential Revision: https://reviews.freebsd.org/D40959 (cherry picked from commit ffd3ef8ee0253ffaf214cf711251d112f6a2bcf6) (cherry picked from commit 845b7c80887ac84c82ee776836ef86d68ea71c94) --- share/man/man9/groupmember.9 | 18 +++++++++++++----- sys/kern/kern_prot.c | 12 ++++++------ sys/sys/ucred.h | 4 ++-- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/share/man/man9/groupmember.9 b/share/man/man9/groupmember.9 index ae7ccd477955..b7865a35fdc9 100644 --- a/share/man/man9/groupmember.9 +++ b/share/man/man9/groupmember.9 @@ -34,9 +34,9 @@ .Sh SYNOPSIS .In sys/param.h .In sys/ucred.h -.Ft int +.Ft bool .Fn groupmember "gid_t gid" "struct ucred *cred" -.Ft int +.Ft bool .Fn realgroupmember "gid_t gid" "struct ucred *cred" .Sh DESCRIPTION The @@ -57,9 +57,17 @@ Function works the same except that it considers instead the real and supplementary groups, and not the effective one. .Sh RETURN VALUES -If the -.Fa gid -is found, 1 is returned, otherwise 0. +The +.Fn groupmember +and +.Fn realgroupmember +functions return +.Dv true +if the given credentials indicate membership of the group +.Fa gid , +or +.Dv false +otherwise. .Sh SEE ALSO .Xr getgroups 2 .Xr setgroups 2 diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 43fc3100bfa7..14b19837d5dc 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1275,7 +1275,7 @@ sys___setugid(struct thread *td, struct __setugid_args *uap) /* * Returns whether gid designates a supplementary group in cred. */ -static int +static bool supplementary_group_member(gid_t gid, struct ucred *cred) { int l, h, m; @@ -1302,12 +1302,12 @@ supplementary_group_member(gid_t gid, struct ucred *cred) * Check if gid is a member of the (effective) group set (i.e., effective and * supplementary groups). */ -int +bool groupmember(gid_t gid, struct ucred *cred) { - if (cred->cr_groups[0] == gid) - return (1); + if (gid == cred->cr_groups[0]) + return (true); return (supplementary_group_member(gid, cred)); } @@ -1316,11 +1316,11 @@ groupmember(gid_t gid, struct ucred *cred) * Check if gid is a member of the real group set (i.e., real and supplementary * groups). */ -int +bool realgroupmember(gid_t gid, struct ucred *cred) { if (gid == cred->cr_rgid) - return (1); + return (true); return (supplementary_group_member(gid, cred)); } diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index 633bf436fcd4..7c9e46e47774 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -158,8 +158,8 @@ void crcowfree(struct thread *td); 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); +bool groupmember(gid_t gid, struct ucred *cred); +bool realgroupmember(gid_t gid, struct ucred *cred); #endif /* _KERNEL */ #endif /* !_SYS_UCRED_H_ */