From nobody Thu Dec 21 13:43:37 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 4Sws8V3ssdz54pcL; Thu, 21 Dec 2023 13:43:38 +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 4Sws8T62gdz4NWh; Thu, 21 Dec 2023 13:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703166217; 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=20gfSf7XhGCdobLBu08/yEc7BVQez8Iq0W1A7sZ0Kgw=; b=YoqGYIle53KWsx2B2uOGS3mgdFuxrmKKQNvtzns0+pyAXvg32AYb11Oo4na1qp3Msd/u+U ojGPZQKcbFxgHM+mQuJskyvoboDNUt2e8CFf/dD+kYb91UHFMiojgMv/Hmk48Hx0hlIi94 czyQLk4a7eWuXyqOAed7CVasf4Cz1qIXTkUiEyMZJrOKQQhWz6Ms8ABIyfOzRCEsgrnUOK 4tW0NhBQTj4+st/vtROSo5mOzJ1mX6k43upzDya1+Hgs8mpgV2oAs+kuo8IHdYxRzxZCup h2t66QK4RokovwLHDcY3rrVXWZDwP8X8OgRGe84bFnE2M5li/eh4GwtZPniCdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703166217; a=rsa-sha256; cv=none; b=EcE9fZLAt0k6/ZoUqVbEKk9f78OB2LQjAIbVol91izz+gH0y2OOzXWUNY2glk1QE9PoCfW qh/5xPGvlAardVVM08RjUsQtPxtbo82gf4bwygTthN6H3cJtnzJfWhLmPksPjeCABduYYa jHoqvWCRPGGBFZSCWTZQYIxC72OVp/4kMDS0CurE1dYxN4Zoh3keVtCXtwM3c4yWgFQmMB SkaUU2HxjTBUKiWLke0LUz19VqiZQKPl8KJ8h4MRV9embs8pd4gFnHmCFoB4CYj3UZOv6n 6XIng7dzqWcDFqOplX2QlUb+wxTEFRe/YmEqAHQV4zN6sBbA56uXCfTc7CfI9Q== 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=1703166217; 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=20gfSf7XhGCdobLBu08/yEc7BVQez8Iq0W1A7sZ0Kgw=; b=R1vwPrf7EtLZxx9CUDlTFoLBsyvbkd6rlxS+wncTH6dzhhLFYFOWtyLB7r5skkQ9p27mPc 2hk6r/eZ2n7ytkXUyAX/wHSxAvPFPIBmxyhyAIAmX++uv5UrliTQCOygZI56/WKxfq8Img i1lOMhVURcLDq4aSj1xt065XgQfTKaJDNEEOARrR8/L3VAuE945XoxwpOIUBvAxGUxCaVy j8R/Zvo5cV+N1s8PC1YRxRjv/j+pv/Xku8kKYJzulbncJ6ex9sXSQpmdQrkYBkEHpENpSk h+eVbHhCjgG1UoYaR/sAF6A3vYSElX848ec/QkqhVHMJ74+yzyUMNGyHWWnWhg== 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 4Sws8T57rPzZF9; Thu, 21 Dec 2023 13:43:37 +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 3BLDhbvR079188; Thu, 21 Dec 2023 13:43:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BLDhbb1079185; Thu, 21 Dec 2023 13:43:37 GMT (envelope-from git) Date: Thu, 21 Dec 2023 13:43:37 GMT Message-Id: <202312211343.3BLDhbb1079185@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: c55330ce4d1a - stable/13 - groupmember(): Extract the supplementary group search in a separate function 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: c55330ce4d1a8cfa214299872f243d1dffc90376 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=c55330ce4d1a8cfa214299872f243d1dffc90376 commit c55330ce4d1a8cfa214299872f243d1dffc90376 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:44 +0000 Commit: Olivier Certner CommitDate: 2023-12-21 13:37:45 +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(). Reviewed by: mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40640 (cherry picked from commit b725f232f3b09b4bcbc426854fe1545234c66965) Approved by: markj (mentor) --- 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 7f196a446315..682754dd7687 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1275,36 +1275,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)); } /*