From nobody Thu Apr 03 19:32:20 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 4ZTBhP2Pq8z5sM45; Thu, 03 Apr 2025 19:32:21 +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 4ZTBhN6zqgz3SfX; Thu, 03 Apr 2025 19:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708741; 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=wmI1d2guClEpZvr7fHJjoKLJ3zc1oAFvT9EqcrISurY=; b=wruQ9YhVPpZnxrPyKEMTpSR0Ng/fHv2ySVZ2n/sFaAyx0tCAipn4WF4diOa4pH6o6sEUXv HKljYnvxaB0OEZbKJOekO7fG7J3b7OEX8DfMDRGoedR9MzT0a7LmSHdCbf5IdZGgVXUzlZ VvXngdTmgM7sqv8Q1XlPjU0B4AXux2XXHHJuDApcE7yt1ycmoSJJUCg1HRjPTIPFVbveGY T/ZRsXPQoen0R6ofWmZlVXYr7OBQFdoYQiJ1HDi/RrpV7oVjPwomv2jIDvVizJWJxSnv4e eODGajDKq2p2KSzkXoz0N05GKYteAHvhSFewddtsC5M5gjN3a9+5T0NvhzpnWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743708741; a=rsa-sha256; cv=none; b=pQIj3sr1Q+8PAMVh3nPdYIG0Jr0wkovOEwDzZifzV34PqD0oCQXY8CmZCV5ROC3vnxkcJA zjGbSTFyN78VUbw7NHsMPYb0LzAWftINLDBKiJ8XVJ+R/7WElG97srt2PS0R3zIaZ9Xkhs inMyXLCkowKcEx4von2opoo5sfEByln8jtyVp3me2yA5QAVXrz8bse/ccb8sDNlPv/Vqx6 F+OdN70in1Nd+jcufpt7c7MtvrY0XuXjTmq60aMO9khf896XIHwxm23YkspQIrkrtX5bgP vK2AVJ+S2mbUMlb4/1179+/kcJ86o8hxsvoQ9ELSNexDt9eONaIFSdTbiV/X+g== 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=1743708741; 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=wmI1d2guClEpZvr7fHJjoKLJ3zc1oAFvT9EqcrISurY=; b=pOIuHSQIxSTkuV2RVPE/xTLJ4SU3Xs94VRnFqXKqcAxE+FOOMwMK21SKief6TBDdCAaXG0 9xun+w1FAMtxHbm47SnTs3V3vdraNqjlBMlnVLkoTzTHWvQ/srLPwIHx1Pj84J6HHkW52h +f7KdUVgn6ziu+RGFzmtyn0i5Up5L8r+7IPWXps18RWnmHl0FkCwCK9rK+IxN7TCJoeBy6 /3bpDrc05LYA4JaBfVo8b8tlNvey2gwPALpz9q/6Ij3C7AWcTMbfle1T34TjWVBrK1t2sl TqH+1RLko/ggjEVTkiUJZBVZCngH+y2cALpyQhkOJBaj3yCpjXM21nCpdW7naw== 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 4ZTBhN6Q3VzZr; Thu, 03 Apr 2025 19:32:20 +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 533JWKe2040291; Thu, 3 Apr 2025 19:32:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JWKxH040288; Thu, 3 Apr 2025 19:32:20 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:32:20 GMT Message-Id: <202504031932.533JWKxH040288@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: 1ccf02edc8e5 - stable/14 - MAC/do: Rename private OSD slot by removing 'mac_do_' prefix 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: 1ccf02edc8e549e437c866be6dd641d4659b7ee1 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=1ccf02edc8e549e437c866be6dd641d4659b7ee1 commit 1ccf02edc8e549e437c866be6dd641d4659b7ee1 Author: Olivier Certner AuthorDate: 2024-11-25 15:07:57 +0000 Commit: Olivier Certner CommitDate: 2025-04-03 19:31:02 +0000 MAC/do: Rename private OSD slot by removing 'mac_do_' prefix This variable is static and holds the OSD slot number for jails that MAC/do uses to store rules. In the same vein as previous renames, simplify it by removing the redundant prefix, as this name cannot appear in code outside of 'mac_do.c', nor in stack traces on panic. Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47772 (cherry picked from commit 40a664a463bab87505c8d42816a71202e8ad7bd9) --- sys/security/mac_do/mac_do.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 5bec02ee2e56..fc1a6de471b6 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -36,7 +36,7 @@ static MALLOC_DEFINE(M_DO, "do_rule", "Rules for mac_do"); #define MAC_RULE_STRING_LEN 1024 -static unsigned mac_do_osd_jail_slot; +static unsigned osd_jail_slot; #define RULE_INVALID 0 /* Must stay 0. */ #define RULE_UID 1 @@ -284,7 +284,7 @@ find_rules(struct prison *const pr, struct prison **const aprp) cpr = pr; for (;;) { prison_lock(cpr); - rules = osd_jail_get(cpr, mac_do_osd_jail_slot); + rules = osd_jail_get(cpr, osd_jail_slot); if (rules != NULL) break; prison_unlock(cpr); @@ -299,7 +299,7 @@ find_rules(struct prison *const pr, struct prison **const aprp) } /* - * OSD destructor for slot 'mac_do_osd_jail_slot'. + * OSD destructor for slot 'osd_jail_slot'. * * Called with 'value' not NULL. */ @@ -317,14 +317,14 @@ dealloc_osd(void *const value) * In practice, this means that the rules become inherited (from the closest * ascendant that has some). * - * Destroys the 'mac_do_osd_jail_slot' slot of the passed jail. + * Destroys the 'osd_jail_slot' slot of the passed jail. */ static void remove_rules(struct prison *const pr) { prison_lock(pr); /* This calls destructor dealloc_osd(). */ - osd_jail_del(pr, mac_do_osd_jail_slot); + osd_jail_del(pr, osd_jail_slot); prison_unlock(pr); } @@ -337,11 +337,11 @@ set_rules(struct prison *const pr, struct rules *const rules) struct rules *old_rules; void **rsv; - rsv = osd_reserve(mac_do_osd_jail_slot); + rsv = osd_reserve(osd_jail_slot); prison_lock(pr); - old_rules = osd_jail_get(pr, mac_do_osd_jail_slot); - osd_jail_set_reserved(pr, mac_do_osd_jail_slot, rsv, rules); + old_rules = osd_jail_get(pr, osd_jail_slot); + osd_jail_set_reserved(pr, osd_jail_slot, rsv, rules); prison_unlock(pr); if (old_rules != NULL) toast_rules(old_rules); @@ -617,7 +617,7 @@ mac_do_init(struct mac_policy_conf *mpc) { struct prison *pr; - mac_do_osd_jail_slot = osd_jail_register(dealloc_osd, osd_methods); + osd_jail_slot = osd_jail_register(dealloc_osd, osd_methods); set_empty_rules(&prison0); sx_slock(&allprison_lock); TAILQ_FOREACH(pr, &allprison, pr_list) @@ -628,7 +628,7 @@ mac_do_init(struct mac_policy_conf *mpc) static void mac_do_destroy(struct mac_policy_conf *mpc) { - osd_jail_deregister(mac_do_osd_jail_slot); + osd_jail_deregister(osd_jail_slot); } static bool