From nobody Thu Apr 03 19:31:56 2025 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 4ZTBgw3sykz5sLrT; Thu, 03 Apr 2025 19:31:56 +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 4ZTBgw2D95z3Rgb; Thu, 03 Apr 2025 19:31:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708716; 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=zFk/K4vHx4qeODhZE5Zl7jCiocrGOsPFx+ibwGAlTpA=; b=oa98za7MrGeJYHBUdbwx1iYfW9YPCunsCMzvJ74lGsqGvc8poockhr3F+XEi/BxhMusg3i 3I7NY7oaOq2bJWVLCem7km7KwSCHgqhVLB/yTtAAxt2Kb1/RFfcAxLpY7YfXmdiUc5Ea/m aAjzqPAHidhdW+SYuLFNv89Sgcrdv4A0rrt/qGUo9k3A5tY4n2RBUK7RVjj2D52oV5YF6Y OU0ODW24D7vpxXWbEagslH+K5MifO9CuQMfcaiA9WYAFgX0XerFYbwXurOSekFcesMfqGD dM9sfcHqIcOZWYMxDfC7s3kKjykiTY6nV8Sq3xQVhpwVaLRUU0UhbNwLW0o4Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743708716; a=rsa-sha256; cv=none; b=uoggP4wnO+F1PtkqlnjIkrX3bMmBK32Qt+vLqOtnAC7JV1JrmhCptlLeFnyhRs5fUffA+l 6gxChwFrVXPsguXlzgtHonQURUrjutm0GRcJ2WNuAgu67qE4TkhsVsW1Lvti0V+R8L2yCM ZKmBudtXMopdP9oDAycp+urke2Cg85WBrrU1NjuC+Ht4kZTjF4RghgbDZso5eh4Id8HJzu 8Rp5Fppw8iJFr/5ZUTTRc/yROlWz0OGkONmLVl/4t1weiqwbMNFT0fiyU5j9XKE62BN8+K BjSFgbSxArza3dYDXAyrJkuQre124LNO1QBzAynpHDG/YpEEiXWyUD1+cdw0Mg== 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=1743708716; 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=zFk/K4vHx4qeODhZE5Zl7jCiocrGOsPFx+ibwGAlTpA=; b=hsXFp9QmWWzQGtk0tbLGbAzWv08XMG2yrSL6iCb/KEejMdhdKRx+7V1DGW7h7UPPe+vjgB nabYCI1KNJtcIg8RzNSa/Xm4HUmh6686Fs8P2CNbnGiPyHKDXaYB78ztnMRtqF1InrsW17 WddEnrVpO05/TV+OBi3CQcUEOmyVjP2sObwK030vJ9RYKDlX6seIA4f/mmC7gJjIJy9UIS pbksreqr0ilKC3zY7NenPKPKrpAR8bN085X8UGGWwsQz5bjVtw8FmAADc/tlGPQQ2IJ2A/ LiHYSUrJPfz+092m70oc++usoHk0prNjAPs9Z6s2T+sJq8z/XOVaWLkwmheV8A== 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 4ZTBgw1qgtzLr; Thu, 03 Apr 2025 19:31:56 +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 533JVuoS033931; Thu, 3 Apr 2025 19:31:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JVuRh033928; Thu, 3 Apr 2025 19:31:56 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:31:56 GMT Message-Id: <202504031931.533JVuRh033928@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: 546477d560ab - stable/14 - MAC/do: Rename internal mac_do_rule_find() => find_rules() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 546477d560abfda2dfaf18dad7d0541194837f7e Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=546477d560abfda2dfaf18dad7d0541194837f7e commit 546477d560abfda2dfaf18dad7d0541194837f7e Author: Olivier Certner AuthorDate: 2024-07-01 14:35:12 +0000 Commit: Olivier Certner CommitDate: 2025-04-03 19:30:56 +0000 MAC/do: Rename internal mac_do_rule_find() => find_rules() To simplify, be consistent with the rename 'struct mac_do_rule' => 'struct rules' and other functions, and because this function is internal (and thus is never the first mac_do(4)'s function to appear in a stack trace). Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47594 (cherry picked from commit 8ce5770604981a19884604ad532f9528e087c69a) --- sys/security/mac_do/mac_do.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 5ac77974379c..1037a4811ada 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -154,7 +154,7 @@ out: } static struct rules * -mac_do_rule_find(struct prison *spr, struct prison **prp) +find_rules(struct prison *spr, struct prison **prp) { struct prison *pr; struct rules *rules; @@ -184,7 +184,7 @@ sysctl_rules(SYSCTL_HANDLER_ARGS) struct rules *rules; int error; - rules = mac_do_rule_find(req->td->td_ucred->cr_prison, &pr); + rules = find_rules(req->td->td_ucred->cr_prison, &pr); mtx_unlock(&pr->pr_mtx); if (req->newptr == NULL) return (sysctl_handle_string(oidp, rules->string, MAC_RULE_STRING_LEN, req)); @@ -235,14 +235,14 @@ mac_do_alloc_prison(struct prison *pr, struct rules **lrp) struct rules *rules, *new_rules; void **rsv; - rules = mac_do_rule_find(pr, &ppr); + rules = find_rules(pr, &ppr); if (ppr == pr) goto done; mtx_unlock(&ppr->pr_mtx); new_rules = malloc(sizeof(*new_rules), M_PRISON, M_WAITOK|M_ZERO); rsv = osd_reserve(mac_do_osd_jail_slot); - rules = mac_do_rule_find(pr, &ppr); + rules = find_rules(pr, &ppr); if (ppr == pr) { free(new_rules, M_PRISON); osd_free_reserved(rsv); @@ -322,7 +322,7 @@ mac_do_prison_get(void *obj, void *data) struct rules *rules; int jsys, error; - rules = mac_do_rule_find(pr, &ppr); + rules = find_rules(pr, &ppr); error = vfs_setopt(opts, "mdo", &jsys, sizeof(jsys)); if (error != 0 && error != ENOENT) goto done; @@ -425,7 +425,7 @@ priv_grant(struct ucred *cred, int priv) if (do_enabled == 0) return (EPERM); - rule = mac_do_rule_find(cred->cr_prison, &pr); + rule = find_rules(cred->cr_prison, &pr); TAILQ_FOREACH(r, &rule->head, r_entries) { if (rule_applies(cred, r)) { switch (priv) { @@ -464,7 +464,7 @@ check_setgroups(struct ucred *cred, int ngrp, gid_t *groups) } free(freebuf, M_TEMP); - rule = mac_do_rule_find(cred->cr_prison, &pr); + rule = find_rules(cred->cr_prison, &pr); TAILQ_FOREACH(r, &rule->head, r_entries) { if (rule_applies(cred, r)) { mtx_unlock(&pr->pr_mtx); @@ -500,7 +500,7 @@ check_setuid(struct ucred *cred, uid_t uid) free(freebuf, M_TEMP); error = EPERM; - rule = mac_do_rule_find(cred->cr_prison, &pr); + rule = find_rules(cred->cr_prison, &pr); TAILQ_FOREACH(r, &rule->head, r_entries) { if (r->from_type == RULE_UID) { if (cred->cr_uid != r->f_uid)