From nobody Wed Oct 18 18:03:54 2023 X-Original-To: dev-commits-src-all@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 4S9dyM1xjtz4xKmK; Wed, 18 Oct 2023 18:03:55 +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 4S9dyM1WxKz4Xxf; Wed, 18 Oct 2023 18:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652235; 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=nxdrLAPIjgtXEZcrULPDyTxm9oEAAyEH2rd0aSDDKyQ=; b=Ys8GPl7cyX0gBwUoGn+IiqR0cV6bO7TBWbWkmMzAhsp++0+6UyP2WwD1rRGXLs80RKc+JV 9JaIG4YRtPoZKeaZWJkt/bQjSvTgHi/nyuQW/wPc7zA4waTPM64ocS5/FW23AHkapzBQp3 PFME5FIkVSb6QsrVyc2FedTZ+7sh6JPGJzhEnRBieo9GL3CKX0J+/uNnOcS2+9bmOZC+3H NgL2A6DTaZyIyyF9RCYCqqeK2dyFcQSvrlhmKcCVSLrAjOA7PmCwTZ6icACOAE0/k3RxmO /drF322sYQELtPsFEg9LH3SxOnOcqXIHyZjtldKwk+xJ8UqC0f4wITI6WzZxGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652235; a=rsa-sha256; cv=none; b=d04wu7ngOPdWOikx/bc6lsdRI4pGeivZcUEyXk176AhfPFPSddx44qQmJQMJ7wrC8+wWbT bVMP1TdvXRqn4rF6y1FZpOogF33968a19Z8W1PJZlR0rkEudyBI2vE0jSMWD3gMmIiHe7g TTITw4HgfFh75R5ZXJ6Jyi3+xZbSjbiEVk/6htARhk9fdRqf8YUpr2TdpXq4N3KnQaNU5V l7RKEOIA0fzW/NFFsCyG9QKWWdESHUo5K/32dBGf6THS/f5ke2anedgtnJZahuJiY4wl80 Ta7ujaoe2lAl3gRlcHeBLzvKpOptS8duldv2pDD2TSYmPC/m/Qmqaba4tarafg== 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=1697652235; 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=nxdrLAPIjgtXEZcrULPDyTxm9oEAAyEH2rd0aSDDKyQ=; b=C7/dqwcFNRzwr8WyUpPA5cMy1m+aOb+u/Xi/GZ6Rl/k+c+fV1I0shbjciWcgB+Zc80rrIr PXamsuas4wupFdrmcLboS8zAq5KZq8hgl5ELgzBUjPkJf0KHV43USZhHOUgsBzZ1vCC9r2 TytHhO335C6MtxQbv3j52a8iMGvOCr7rlMc89RvIjKD6zM4+2orSA071MJSxG2RC+mtZ5W tRQiiUwg9Ea7Xnw6Ujj35NNzg1tE+EbiGbLDezyQgqAwveoDHwFNQWj2Tpf62BJdjDBnjB lLg7ivYmOskGvzni0SWwgpMBkS7Sri3RthOuU617rBHwUTaKmycstfz5FNkRmQ== 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 4S9dyM0Ftsz1nf; Wed, 18 Oct 2023 18:03:55 +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 39II3sx4044926; Wed, 18 Oct 2023 18:03:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3s0E044923; Wed, 18 Oct 2023 18:03:54 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:54 GMT Message-Id: <202310181803.39II3s0E044923@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: f373119badd8 - releng/14.0 - groupmember(): Extract the supplementary group search in a separate function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f373119badd89f81401c8599869749d4a0fd4a8e Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f373119badd89f81401c8599869749d4a0fd4a8e commit f373119badd89f81401c8599869749d4a0fd4a8e Author: Olivier Certner AuthorDate: 2023-08-17 23:54:44 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:01:38 +0000 groupmember(): Extract the supplementary group search in a separate function This is in preparation for the introduction of the new realgroupmember() function, which does the same search into supplementary groups as groupmember(). Approved by: re (gjb) Reviewed by: mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40640 (cherry picked from commit b725f232f3b09b4bcbc426854fe1545234c66965) (cherry picked from commit 9fc5dbab5163b1e18776ac216691cc7eb8566a6f) --- sys/kern/kern_prot.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 648c067dc528..21f5e5d3bc16 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1273,36 +1273,43 @@ sys___setugid(struct thread *td, struct __setugid_args *uap) } /* - * Check if gid is a member of the group set. + * Returns whether gid designates a supplementary group in cred. */ -int -groupmember(gid_t gid, struct ucred *cred) +static int +supplementary_group_member(gid_t gid, struct ucred *cred) { - int l; - int h; - int m; - - if (cred->cr_groups[0] == gid) - return(1); + int l, h, m; /* - * If gid was not our primary group, perform a binary search - * of the supplemental groups. This is possible because we - * sort the groups in crsetgroups(). + * Perform a binary search of the supplemental groups. This is possible + * because we sort the groups in crsetgroups(). */ l = 1; h = cred->cr_ngroups; + while (l < h) { - m = l + ((h - l) / 2); + m = l + (h - l) / 2; if (cred->cr_groups[m] < gid) - l = m + 1; + l = m + 1; else - h = m; + h = m; } - if ((l < cred->cr_ngroups) && (cred->cr_groups[l] == gid)) + + return (l < cred->cr_ngroups && cred->cr_groups[l] == gid); +} + +/* + * Check if gid is a member of the (effective) group set (i.e., effective and + * supplementary groups). + */ +int +groupmember(gid_t gid, struct ucred *cred) +{ + + if (cred->cr_groups[0] == gid) return (1); - return (0); + return (supplementary_group_member(gid, cred)); } /*