From nobody Thu Apr 3 19:31:55 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 4ZTBgv34SJz5sLmS; Thu, 03 Apr 2025 19:31: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZTBgv1WxYz3RRp; Thu, 03 Apr 2025 19:31:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708715; 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=b+7NUhcM7VN9YBdhn5qrjWGnC5XyxARl/I8qAlevRac=; b=MUuggiG3iybbKooHnMCx3eru96CgwFi8Q85Ylr4GprMgJwi0AsQAwtVFInJlnWfG85teeX EfY+VrdPm+n2nKml82QMythOH6Zl4IiMg8NVAhXIbZeOmHtLnJZSSuE+dob4vWrdXRxlny nyL5NUf6B6H6oukXM+cMiZVZqp+ALaK+yhJeXMTJNtKOnLQr0GezVvivj69pwUxzc0Usas rLvujJAigKm6ZZgJ+udta4so8Lk8+ifMilJeZjb4TDcC/Cx9thds2kaCb1MN5qD4rl7eQq F+th2WrM0GD8AZgzCK3MgYdiRKaS1j5kgloCcXvdXuQ4fjnL5RGltXjulsIBrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743708715; a=rsa-sha256; cv=none; b=gV5bC8swKINt+581VTrA10iKBzazZCIKXadNu3z+iaE/tv1ug402iTULQTxBFpVEIZ2SGH ubcwy+h8ywIQkuKHfcf6yURXhdkoCe03+rt3atuKwbSPeWG1/60NBD81TZ/20+JKhmOPZA LQQJSgyij4uDpeW//7CG2HzdROKjGVOzbBH5CQooipMbQs/gKE63fBaw3gZQk0x40U+BR/ kUUPHScwd0Nmftzkj9JcRUjkhYTWkO7bAus+dIZH5hL7I8sXFkQN5x73KDF8UnztBpBc83 2j0X/O5wvFPYRnsxBYKA4LCWfBBQlCp17ftWUcoK8QIemCIMVllm72rnK4r/wA== 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=1743708715; 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=b+7NUhcM7VN9YBdhn5qrjWGnC5XyxARl/I8qAlevRac=; b=BWh8uaegk6N9hfzh6T8zo1AwhWj+srbHz2kyq3rPdavZp7IRBoRqIpFCrUqVulHIquST0P EOBJSAPZcpINVWz20o5lKUSTsMicAf+vQXqtOJdkjs6WV8LLQDJSPQQGaPfVHSXL4SR6Bw Qy6DjUag0M/qLxkcBYq+XiWnK62HjZcjR3BRHPs5FrmBGYMVsU0P0xPMD2PYsY5tqBfSDW kXQhIECt0nuHr+iQwbxOBLWizIEztzPmZgYcTEpi+XK+cMQ9tP6MSyCK7Wk9EY3uW6f2Po S6BTi7JM47n8n59averUw+SC06CpBJOK6gI8XFjpUaa8K0qHNKhfqGDlXzCipg== 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 4ZTBgv17jjzZk; Thu, 03 Apr 2025 19:31:55 +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 533JVtaq033895; Thu, 3 Apr 2025 19:31:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JVtOC033892; Thu, 3 Apr 2025 19:31:55 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:31:55 GMT Message-Id: <202504031931.533JVtOC033892@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: d50dbaf784de - stable/14 - MAC/do: Rename private struct 'mac_do_rule' => 'rules' 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: d50dbaf784de92fea98a5116184537f3dc012be0 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d50dbaf784de92fea98a5116184537f3dc012be0 commit d50dbaf784de92fea98a5116184537f3dc012be0 Author: Olivier Certner AuthorDate: 2024-07-01 14:28:20 +0000 Commit: Olivier Certner CommitDate: 2025-04-03 19:30:56 +0000 MAC/do: Rename private struct 'mac_do_rule' => 'rules' To simplify and be consistent with 'struct rule'. Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47593 (cherry picked from commit 02ed945ccec43340208d3a9c152fb98f55dbed69) --- sys/security/mac_do/mac_do.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 4cc2a7971545..5ac77974379c 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -53,12 +53,12 @@ struct rule { TAILQ_ENTRY(rule) r_entries; }; -struct mac_do_rule { +struct rules { char string[MAC_RULE_STRING_LEN]; TAILQ_HEAD(rulehead, rule) head; }; -static struct mac_do_rule rules0; +static struct rules rules0; static void toast_rules(struct rulehead *head) @@ -153,11 +153,11 @@ out: return (error); } -static struct mac_do_rule * +static struct rules * mac_do_rule_find(struct prison *spr, struct prison **prp) { struct prison *pr; - struct mac_do_rule *rules; + struct rules *rules; for (pr = spr;; pr = pr->pr_parent) { mtx_lock(&pr->pr_mtx); @@ -181,7 +181,7 @@ sysctl_rules(SYSCTL_HANDLER_ARGS) char *new_string; struct rulehead head, saved_head; struct prison *pr; - struct mac_do_rule *rules; + struct rules *rules; int error; rules = mac_do_rule_find(req->td->td_ucred->cr_prison, &pr); @@ -229,10 +229,10 @@ destroy(struct mac_policy_conf *mpc) } static void -mac_do_alloc_prison(struct prison *pr, struct mac_do_rule **lrp) +mac_do_alloc_prison(struct prison *pr, struct rules **lrp) { struct prison *ppr; - struct mac_do_rule *rules, *new_rules; + struct rules *rules, *new_rules; void **rsv; rules = mac_do_rule_find(pr, &ppr); @@ -261,7 +261,7 @@ done: static void mac_do_dealloc_prison(void *data) { - struct mac_do_rule *r = data; + struct rules *r = data; toast_rules(&r->head); } @@ -272,7 +272,7 @@ mac_do_prison_set(void *obj, void *data) struct prison *pr = obj; struct vfsoptlist *opts = data; struct rulehead head, saved_head; - struct mac_do_rule *rules; + struct rules *rules; char *rules_string; int error, jsys, len; @@ -319,7 +319,7 @@ mac_do_prison_get(void *obj, void *data) { struct prison *ppr, *pr = obj; struct vfsoptlist *opts = data; - struct mac_do_rule *rules; + struct rules *rules; int jsys, error; rules = mac_do_rule_find(pr, &ppr); @@ -348,7 +348,7 @@ static int mac_do_prison_remove(void *obj, void *data __unused) { struct prison *pr = obj; - struct mac_do_rule *r; + struct rules *r; mtx_lock(&pr->pr_mtx); r = osd_jail_get(pr, mac_do_osd_jail_slot); @@ -420,7 +420,7 @@ priv_grant(struct ucred *cred, int priv) { struct rule *r; struct prison *pr; - struct mac_do_rule *rule; + struct rules *rule; if (do_enabled == 0) return (EPERM); @@ -449,7 +449,7 @@ check_setgroups(struct ucred *cred, int ngrp, gid_t *groups) char *fullpath = NULL; char *freebuf = NULL; struct prison *pr; - struct mac_do_rule *rule; + struct rules *rule; if (do_enabled == 0) return (0); @@ -484,7 +484,7 @@ check_setuid(struct ucred *cred, uid_t uid) char *fullpath = NULL; char *freebuf = NULL; struct prison *pr; - struct mac_do_rule *rule; + struct rules *rule; if (do_enabled == 0) return (0);