From nobody Mon Jun 29 19:25:43 2026 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 4gpx876Rxlz6jjZ0 for ; Mon, 29 Jun 2026 19:25:43 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpx873rjtz40MM for ; Mon, 29 Jun 2026 19:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782761143; 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=S16wQpEp0GvVOS5EQ4en8vqVVQUU5fWhhHgzdAXSFFk=; b=CZ01Z/NgR5r2fkquqqjLeMuHO0zwSeHtydIsT6IdwsdNJpcnEE8V+oRSkdwsrIopo2h5tQ BwL9pxXqre+m4GC6gBLj+9VVG5yPCNFZYTiEzAOmNso/r8H//k1sTGmlDJ0sazJMVFgSbM JUAs/iJQa1MiLKe8EupcxsAqX/YMfY9MMUXS3Rm1cxm/n1WObFHZoxT1QjatWM6rUoWLy/ rQtpA3NUYxOhU7FHe71Q7O5ui/xV9bS0dRn8twVrgzyMAdlu42yJfEcjNQogsjgpLuVFXW QXSzTJNoxFO6VigXIoW2WydhX6zDLpfOxhPKZDvUYZIv9m3v/I8HKDe4nqegOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782761143; a=rsa-sha256; cv=none; b=LW2hk3rPbibCNWYsRdGO9OJUAOqM9FMGxUJ7yE/gZBE5DEv/Y0LO4f6LOyAJxB0w2Eth9k L1pcdElCtlbj68sMqKnlt930CqxsNSXKxaL3evgpYkPvcHthSb5MSGdJ+L7TNqindZq6t2 msffiAZhkZcWirfCvXpVeDQspZkgBF2w+sG6d0CoIcxhMwrUzhbMLD/fQZVm/f6oUbdBoM +6q+mmnNOhlLxglwRKXWkJsoghu5EuNLNC6fwT1nxV0HDq3c2G2IE6fXsXI9ZjPgCXCO/S XDT7hTxuiLP9WiKhd+Dk0zrL26vQnnNRIQ0SfNT6ucStj23kgpKg37JAlx9Iqw== 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=1782761143; 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=S16wQpEp0GvVOS5EQ4en8vqVVQUU5fWhhHgzdAXSFFk=; b=xPl02vAmqItWfDsAHG/hr60CQhaKNlvPUTyY/nnc8yJ16nzJPOy2PArxqRheL/PdRmtNYu IsG45waXbt9xJD16LWBRLo2fHwVqk1vKh94vhhsZqq+RQj6vsQnNYmbtBcpgl7TtwxfJK6 hGfRq3cdLBvQAazEHnah1f291j/w/YNpLYK3NowHar4MSzdreSBYL5ncwnWEu+JPKCKjFL MTuor8kRit/zbn3DUrHK37QyOa2ewXIqDhNmT5Kb8kHMUNvcS3NZZJSTyoaMTCO9/i4kpL AloqvXAAEZhQ7SiPWtS6MAqSzHySIJgKZeRvESBx6lxYPZb7CXTwrO1GbYLQ1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpx872bcrz19bR for ; Mon, 29 Jun 2026 19:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21d85 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 19:25:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 9383427b2f90 - stable/15 - MAC/do: Move hold_conf() and drop_conf() earlier 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: 9383427b2f906dc39ac61a466afa642f3707f2f8 Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 19:25:43 +0000 Message-Id: <6a42c6b7.21d85.33e5883d@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=9383427b2f906dc39ac61a466afa642f3707f2f8 commit 9383427b2f906dc39ac61a466afa642f3707f2f8 Author: Olivier Certner AuthorDate: 2026-04-27 12:55:05 +0000 Commit: Olivier Certner CommitDate: 2026-06-29 19:23:42 +0000 MAC/do: Move hold_conf() and drop_conf() earlier This is in preparation for using hold_conf() in find_conf(). Reviewed by: bapt MFC after: 1 month Sponsored by: The FreeBSD Foundation Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/38 (cherry picked from commit cd1ac04409359ec1357e23752f20b22f5055ddfa) --- sys/security/mac_do/mac_do.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 0b224a24e0a7..e844cda7e1c4 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -1162,6 +1162,21 @@ error: goto out; } +static void +hold_conf(struct conf *const conf) +{ + refcount_acquire(&conf->use_count); +} + +static void +drop_conf(struct conf *const conf) +{ + if (refcount_release(&conf->use_count)) { + toast_rules(&conf->rules); + free(conf, M_MAC_DO); + } +} + /* * Find configuration applicable to the passed prison. * @@ -1202,21 +1217,6 @@ find_conf(struct prison *const pr, struct prison **const aprp) return (conf); } -static void -hold_conf(struct conf *const conf) -{ - refcount_acquire(&conf->use_count); -} - -static void -drop_conf(struct conf *const conf) -{ - if (refcount_release(&conf->use_count)) { - toast_rules(&conf->rules); - free(conf, M_MAC_DO); - } -} - #ifdef INVARIANTS static void check_conf_use_count(const struct conf *const conf, u_int expected)