From nobody Thu Apr 3 19:31:53 2025 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 4ZTBgt38ZJz5sLty; Thu, 03 Apr 2025 19:31:54 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZTBgt0bYWz3Rcq; Thu, 03 Apr 2025 19:31:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708714; 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=ar0DUZ6wHtr3ER4oNM3YTT1HO5Ec3ffMriCAHhd8Tyc=; b=KtLHKrnJaXO3KtL5PU94JfJ8x6MKn2wdq3Pkc/8lX2S6nn+XdpYoFRjHVO1uaxcI126flB jnR+MLB4uyc2tT0Yj6zAe9wYiDHTVWOAbalUHIYNUFpC3dd6AqHle/S0uHTIEYjAWDfkvo t1t3CzmW4cmC+KIktUGI8nVdyhX07y559BtxUeAtqqoVvvSbaXBpHbsls2Pm0DlHLETJT3 raUwpCsy72wqvtJTO3pUoMrrH5cg6t5VKfEBEQs5hwxgEh0+dpG/39C8P135spGjl207EQ IUIsBfzpQyL/K5RM1MkUXUb26OA55VquQt2RkF+rIBXjPOK4e4ZIhP1ACR7zzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743708714; a=rsa-sha256; cv=none; b=MTuPxWhFH6lY5TsEjnYHhr+6t1LyJKsM/EJuBXOXK2SB+8z9aXYtjSZoK3MdyLxnUPbEee qeBmUwCRfrB381scLPvzHPgklGY39BduvwlfbqPYaRgZ+GZctJWIC4EbTrXbqlPZ++ASPf AP4fk6pslSwxLCQpDkb4vKiATpbz3d3uAfrOJak+L8lxNYKXEQ4GptClBNHwddskE+6r/2 A9+2A6skPLwdi7LYFM2dr65yVC95Fc8XLVPyKvwX6ZIRJbftOLCi30JxKJqP/uRNyFassQ GIlYSesYRcrryTDZzyiicKDrXxNM9E1yf5mh/pnfVRiKXQO7atdVDVJL9HiiXg== 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=1743708714; 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=ar0DUZ6wHtr3ER4oNM3YTT1HO5Ec3ffMriCAHhd8Tyc=; b=ev9J0L3aN8sxc8lNw4rXeqlM6Wzaas8XIw3TboktrRqq3usPmhGO8r1V6BV94J31DjmHdK pzlX9ATpeNCjM7vg1rSJFGjpgcxYR3zo4bhQh3eIwXXZC1NHxF/WWWgHgOO451h3NkAZB5 kibGqOUh1p1tf4QR5GjJVrlp1I7mGG0vdog9mGDxcNiBK2zWWZCwaayTDDe3NN6VSvVlFv b5G6I1u6O2Vu1C9+kRJqTeDPAwuQeRb4bYduElsrn93IsRG0QnAif5OZ0CHm75/JbmIj+A yGlzrwj3ZKf8wDRXa7iSr3YUCbuvmaPkySlCz46ecgeH3iYM1d0cH37R2/uztg== 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 4ZTBgt09B6zLq; Thu, 03 Apr 2025 19:31:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 533JVrZ0033855; Thu, 3 Apr 2025 19:31:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JVrpf033852; Thu, 3 Apr 2025 19:31:53 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:31:53 GMT Message-Id: <202504031931.533JVrpf033852@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: 41d1660fcf39 - stable/14 - MAC/do: Rename rule_is_valid() => rule_applies() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 41d1660fcf39a44a14756b97ec067c63b3de64a2 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=41d1660fcf39a44a14756b97ec067c63b3de64a2 commit 41d1660fcf39a44a14756b97ec067c63b3de64a2 Author: Olivier Certner AuthorDate: 2024-07-01 13:24:47 +0000 Commit: Olivier Certner CommitDate: 2025-04-03 19:30:56 +0000 MAC/do: Rename rule_is_valid() => rule_applies() This function checks whether a rule applies in the current context, i.e., if the subject's users/groups match that of the rule. By contrast, it doesn't check if the rule as specified by the user is valid (i.e., consistent). Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47592 (cherry picked from commit ccae2774897c1f8bb11f696d5895fb686db98176) --- sys/security/mac_do/mac_do.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 2ddc13d62b4f..4cc2a7971545 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -406,7 +406,7 @@ init(struct mac_policy_conf *mpc) } static bool -rule_is_valid(struct ucred *cred, struct rule *r) +rule_applies(struct ucred *cred, struct rule *r) { if (r->from_type == RULE_UID && r->f_uid == cred->cr_uid) return (true); @@ -427,7 +427,7 @@ priv_grant(struct ucred *cred, int priv) rule = mac_do_rule_find(cred->cr_prison, &pr); TAILQ_FOREACH(r, &rule->head, r_entries) { - if (rule_is_valid(cred, r)) { + if (rule_applies(cred, r)) { switch (priv) { case PRIV_CRED_SETGROUPS: case PRIV_CRED_SETUID: @@ -466,7 +466,7 @@ check_setgroups(struct ucred *cred, int ngrp, gid_t *groups) rule = mac_do_rule_find(cred->cr_prison, &pr); TAILQ_FOREACH(r, &rule->head, r_entries) { - if (rule_is_valid(cred, r)) { + if (rule_applies(cred, r)) { mtx_unlock(&pr->pr_mtx); return (0); }