From nobody Thu Apr 3 19:32:10 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 4ZTBhC2JVhz5sM19; Thu, 03 Apr 2025 19:32:11 +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 4ZTBhB4y5fz3SGR; Thu, 03 Apr 2025 19:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708730; 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=Ge2eM/1xAFnGDifZ0bDSLdVWRr9s61cQ3FuA91ETudM=; b=CV0aSrPfk6jnAPxsgdRZJDZPtFa9XAim4EG3DJjq0mKIHFYK4pfwSCMr6L/0pyEVWgEsmq oGwNobXhyymiSDqTdsmqRKQVTPWb5GY3A/lnFP9j9TUCrwy+k4IBTYV0BFWnx3fEU60itT arMigqe0ajzPXkuhglERb6ccHK1ZrT6abPeVacUFm/V4q0azah6bdVkV02fQ0cR85DezBg PRxCXHHJLAqGjjWqBY0TMutOTi4kGgaGmKGGHkJZvlFtiW5yRRHbDwDfN9g178c7eQq7WJ CBAPI5N3gz+UExTU307buYvA1ZXKSM691L+tI4y0b/yM8RodUPEzAov2U8jg8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743708730; a=rsa-sha256; cv=none; b=VaBVG7oy/03h7nWlfORt3scuRXOxUI9SO58cIVE7Y/CdBL1ceCKWRVfY9VmZHq98olsVtZ gj1vnutM0Cz4cWIlHXjna0gQ2EwGX9E6kKAAEUi1SjmZdzpfF4XSo5IdPWD0iNLA4MWca/ kapT1HqGyXHy4E5JnDTNEOHN3XtnlqaPdubYXpUEHLcApWsVLP9Xc6wjhETW5t6CLiDfVX /JyV1wX7Y5637vrR93HsiCNxejewAeW4pdYbnZN6ysY0mg/dKg6Ax/fYkAujBPsX4EdFQA MZLVocW8sud44G9ciasc5xGivJS7ZYKJDTkPvKGbdDvPJlsB8bh2pAhY+GHSZw== 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=1743708730; 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=Ge2eM/1xAFnGDifZ0bDSLdVWRr9s61cQ3FuA91ETudM=; b=ZuQ6AirRwmUZVPsK6C+FuGPesYCn+EryzTby53fuMeUyEFaX4MZxDfMFfeYAOBNuVjekvx hAZyzJJMe8jETjG8VSx0c16LSSXDzB5LzsgULtZuOCq41cGYXymA+aAbcCBfrv2QArFnfw bFH5t0yfRd5ziGtSiCLX2c37EcyBF9Fr3buziGQ1uDjmQyJ3drQN35/Xu6vH17ibgv/RZV 71+hUyond37fMpWMc8FXv6VmdHxD+5Eyse7ZxsvtViuxu3484dXpC3YWXmqg0TYNAok0hT mYBDf8QLNQXXMVnTrdqzBI887FJMzocby5g3cTJzNH87iWLY8u80b8kKz6A3bg== 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 4ZTBhB4W8BzkJ; Thu, 03 Apr 2025 19:32:10 +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 533JWA8N039988; Thu, 3 Apr 2025 19:32:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JWAiC039985; Thu, 3 Apr 2025 19:32:10 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:32:10 GMT Message-Id: <202504031932.533JWAiC039985@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: e014e1fd4b54 - stable/14 - MAC/do: Prefix internal functions used as hooks/callbacks 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: e014e1fd4b54e9936d8a73121ed6dcd9a81ed504 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=e014e1fd4b54e9936d8a73121ed6dcd9a81ed504 commit e014e1fd4b54e9936d8a73121ed6dcd9a81ed504 Author: Olivier Certner AuthorDate: 2024-07-30 13:14:02 +0000 Commit: Olivier Certner CommitDate: 2025-04-03 19:31:00 +0000 MAC/do: Prefix internal functions used as hooks/callbacks So that we immediately know whether a kernel stack involves MAC/do. Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47607 (cherry picked from commit 11ba1f2fe2d4e151ffc0a66d03a0691a7b8d2866) --- sys/security/mac_do/mac_do.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 78c05e9be260..a57c29c407b8 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -309,7 +309,7 @@ parse_and_set_rules(struct prison *const pr, const char *rules_string) } static int -sysctl_rules(SYSCTL_HANDLER_ARGS) +mac_do_sysctl_rules(SYSCTL_HANDLER_ARGS) { char *const buf = malloc(MAC_RULE_STRING_LEN, M_DO, M_WAITOK); struct prison *const td_pr = req->td->td_ucred->cr_prison; @@ -334,7 +334,7 @@ out: SYSCTL_PROC(_security_mac_do, OID_AUTO, rules, CTLTYPE_STRING|CTLFLAG_RW|CTLFLAG_PRISON|CTLFLAG_MPSAFE, - 0, 0, sysctl_rules, "A", + 0, 0, mac_do_sysctl_rules, "A", "Rules"); @@ -445,7 +445,7 @@ static const osd_method_t osd_methods[PR_MAXMETHOD] = { static void -init(struct mac_policy_conf *mpc) +mac_do_init(struct mac_policy_conf *mpc) { struct prison *pr; @@ -458,7 +458,7 @@ init(struct mac_policy_conf *mpc) } static void -destroy(struct mac_policy_conf *mpc) +mac_do_destroy(struct mac_policy_conf *mpc) { osd_jail_deregister(mac_do_osd_jail_slot); } @@ -474,7 +474,7 @@ rule_applies(struct ucred *cred, struct rule *r) } static int -priv_grant(struct ucred *cred, int priv) +mac_do_priv_grant(struct ucred *cred, int priv) { struct rule *r; struct prison *pr; @@ -501,7 +501,7 @@ priv_grant(struct ucred *cred, int priv) } static int -check_setgroups(struct ucred *cred, int ngrp, gid_t *groups) +mac_do_check_setgroups(struct ucred *cred, int ngrp, gid_t *groups) { struct rule *r; char *fullpath = NULL; @@ -535,7 +535,7 @@ check_setgroups(struct ucred *cred, int ngrp, gid_t *groups) } static int -check_setuid(struct ucred *cred, uid_t uid) +mac_do_check_setuid(struct ucred *cred, uid_t uid) { struct rule *r; int error; @@ -590,11 +590,11 @@ check_setuid(struct ucred *cred, uid_t uid) } static struct mac_policy_ops do_ops = { - .mpo_destroy = destroy, - .mpo_init = init, - .mpo_cred_check_setuid = check_setuid, - .mpo_cred_check_setgroups = check_setgroups, - .mpo_priv_grant = priv_grant, + .mpo_destroy = mac_do_destroy, + .mpo_init = mac_do_init, + .mpo_cred_check_setuid = mac_do_check_setuid, + .mpo_cred_check_setgroups = mac_do_check_setgroups, + .mpo_priv_grant = mac_do_priv_grant, }; MAC_POLICY_SET(&do_ops, mac_do, "MAC/do",