From nobody Thu Apr 03 19:32:07 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 4ZTBh773NZz5sLxt; Thu, 03 Apr 2025 19:32:07 +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 4ZTBh72vl6z3SB9; Thu, 03 Apr 2025 19:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708727; 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=vEgEdTGbr54huzJnqGKMFj7ufB0VYGpSmo5Jsx2W1LM=; b=onkSx2lnp+XZQNfbN6bOreEuDchI8CcImeSmrLQKq7BcxZXM4VvcINJagOLNZkU9FS1sF6 HBuynwepBWAgbLMCgAvueI/sh5m/Cqp97K7YMcAJMb7L0KeOYfzJR/RcHVt0L1+NiSuZXY VFo36Tq97Cmxb5C5Ttrsd1lV5J5g27BTpbKqFFwv5f19dcXsPfLQQE5hf1e2oUxwJklhvf ojbQMvBuIbeXDI0HH3zYIdM+hys+7zvLpkaGUogTadAxi/QhYLbsMWL4POLozw3FEgcAVA p4SR1at2sXfOiFO0OSy/zxruSQTt7mki4FyF3QJqVcXAZshNQfkjJdy6hk9jlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743708727; a=rsa-sha256; cv=none; b=q4kjb+k2G8yE1ILvDISrbGtlm6zZewUMzW5KD0746LhzsKpMIcSO5lO9MaQgLy0Mmnczgz O9Wt5ppHBOkxB+8wlCdRCxU1aJUhvYtM+WMwFwT8KdfPuwW25CWQ37pPEIfHKFa0NG2sOp QcHIgHKMNDF01ujz+6hQBaMyv4RahkuAFEBbcE6dXRI+5c06If+hPTfLe1e1XBqn3z3dP3 WvwOf16qwKQko0LT/RB675Swh0V4tVn6MjWvJNtvTdM6aYH2AEfg2UinsOUS+dmqRsrV0p bwZ2w8zfoBQvMN3vuZ3JBX7c7Va4jLW8JaguLqXpgOZh2ofK8vQmMJ9ULX/qZg== 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=1743708727; 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=vEgEdTGbr54huzJnqGKMFj7ufB0VYGpSmo5Jsx2W1LM=; b=THEJrQAUdr4wyQxwNm4vM/qxVoo+hvwenmzeRTwQVP6sSeBpWCJY0hLxM/fmCdmnCTwtkN W7+T70wkEeIYI9PfZz3g6u50ewvdORJYV9LcRQ2D7PlrQaJUiKeaVpdz7Z3lhqkfgN3kbb WdQX7mWVXbhFLBs6pFewUP3ZLYE63yk748ihJrM0RKc7xwit6I6+pmTQ7ErH/8mLSktlQR R6P7dYjiXvfQs4lYqo3HFj5P7m2vNuhxjJwUDJhVL0vXNjDqk4M5EtLJ6PBw04kS3PXqSB KcIOUmsHVdIiL/KKaR5D5aJFBYrJ8/P7Q/0dgYupQA3+COLuYdNces64iATMIg== 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 4ZTBh72RKczZm; Thu, 03 Apr 2025 19:32:07 +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 533JW7XE039520; Thu, 3 Apr 2025 19:32:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JW7ka039507; Thu, 3 Apr 2025 19:32:07 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:32:07 GMT Message-Id: <202504031932.533JW7ka039507@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: 8d8c3948544c - stable/14 - MAC/do: Move destroy() to a better place 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: 8d8c3948544c6e8a4c93cdcec3de428132d9ac28 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=8d8c3948544c6e8a4c93cdcec3de428132d9ac28 commit 8d8c3948544c6e8a4c93cdcec3de428132d9ac28 Author: Olivier Certner AuthorDate: 2024-07-03 13:52:33 +0000 Commit: Olivier Certner CommitDate: 2025-04-03 19:30:59 +0000 MAC/do: Move destroy() to a better place No functional change intended. Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47604 (cherry picked from commit 73cecc0ef78e49295cd9cd8df1bf271f5b8c437d) --- sys/security/mac_do/mac_do.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 8ce84d7ba099..cb166cfd6128 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -329,12 +329,6 @@ SYSCTL_PROC(_security_mac_do, OID_AUTO, rules, 0, 0, sysctl_rules, "A", "Rules"); -static void -destroy(struct mac_policy_conf *mpc) -{ - osd_jail_deregister(mac_do_osd_jail_slot); -} - static int mac_do_prison_set(void *obj, void *data) { @@ -452,6 +446,12 @@ init(struct mac_policy_conf *mpc) sx_sunlock(&allprison_lock); } +static void +destroy(struct mac_policy_conf *mpc) +{ + osd_jail_deregister(mac_do_osd_jail_slot); +} + static bool rule_applies(struct ucred *cred, struct rule *r) {