From nobody Mon Jun 29 19:25:36 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 4gpx811y5nz6jhsg for ; Mon, 29 Jun 2026 19:25:37 +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 4gpx8071dHz3yvH for ; Mon, 29 Jun 2026 19:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782761137; 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=/NDx/c6qgSQmtCMPvUzxVvBTDY33XUnGoLPTC+lJs90=; b=xIzsrSx/nFwxK1KOX8fWhoyEcsGQ3o7uIIsHklFSv31oJQXX5cGrS0pZQKU5VLAmMnSWlX utRye7muD1DzGUozOxEYNu/KFGgJdmNWgZr4vfzm96i4CYvTZYErkumdAmku/Slb3r6HqI 49PoOGGOFAs5lNEuebHDTIaRAYqxlCikmXyyPdw1lM3hbgZ88vlcniDkgMbtNHfQb81GZ7 m4hFfxT3BNLl0SvCHWq1ZqRx2ELBBa8u0RGEn1RJePwJ9kEJm6KX6q68aUjRm8L7GBQbxH p8e5jIqIlldcbCwXd/+1qBKxoEsZPZruvjeDFnHIUw95oWyVb72nYJGuCWdINA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782761137; a=rsa-sha256; cv=none; b=lXXCXh2Msbiqhzs1OpUIGxMH88r4sgTxVEtgS6nPzUuoEBoK3Fg8IomW4K3Xui9B5V2R6z WNTglQexLwq1xh0LOVUaAc8m2LiHiWgYn+iJJk+1FYjZRPnkQ03YSOocZ0BGCrbw+D9aB2 Z7BOcfMVoPOd0q+ZWr8gkk2it4vCd1a2S3hPY7Twj5hXArCCeaXuMhbItkwh+NS0M7y9tx epzhLqVIIX9JsSZpL5RliqexHfQoFi7b7dpyHIsJbrvBwHMq7hnLpd4PL2BfrTDEz0zmHi ZQERtHA1y/ElX4t8EeaanXhTa8v/cc5iOJV7rcxFXrLXwNlcbWi9WFtQlExEKw== 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=1782761137; 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=/NDx/c6qgSQmtCMPvUzxVvBTDY33XUnGoLPTC+lJs90=; b=Sl5Mi+PAL672fnK0TgyWLkMHskkUzOqwg+5p5zFaWCsv67gt+v43CfEvbm/xq43OoPki/I NSDmKqLSRP39UwMeorNubK9K9dQuELFlrv3rBHD2VsJgxe0RMSl4S6NSDhqDehmQXISFY/ WZj4ykaTPxuW22Ud8/8RPxtIPjgk84lHXt6MVTBQ7t+DO4/6B//vo10rpCWFoXMmi76S7s rNDZhvPXt1bwBbSNVa2n2Bc/3WNShjNhnyMGBZzxvcvT2LmszkPIGdlnzrx/oPZdBHoVh/ hk15NLBu62ljjzK0HFJ6j6ERvmWYmNJuSgae+7KVx4dQQX+eaIPLuWQpOgnmmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpx806089z198C for ; Mon, 29 Jun 2026 19:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 218b2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 19:25:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: f99c921251ae - stable/15 - MAC/do: Expand "conf" to "configuration" in a panic message on INVARIANTS 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: f99c921251aef519ed8926d3512f968006fcb84c Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 19:25:36 +0000 Message-Id: <6a42c6b0.218b2.44f5d0fa@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f99c921251aef519ed8926d3512f968006fcb84c commit f99c921251aef519ed8926d3512f968006fcb84c Author: Olivier Certner AuthorDate: 2026-03-23 14:42:07 +0000 Commit: Olivier Certner CommitDate: 2026-06-29 19:23:38 +0000 MAC/do: Expand "conf" to "configuration" in a panic message on INVARIANTS No functional change. Reviewed by: bapt Fixes: 9818224174c4 ("MAC/do: Executable paths feature (GSoC 2025's final state)") MFC after: 1 month Sponsored by: The FreeBSD Foundation Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/38 (cherry picked from commit 22a0912bb1dc71f18d2e33ec9915a54a8324a3ff) --- sys/security/mac_do/mac_do.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 95c7007b6a8a..16f7d90f031b 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -1203,8 +1203,8 @@ check_conf_use_count(const struct conf *const conf, u_int expected) const u_int use_count = refcount_load(&conf->use_count); if (use_count != expected) - panic("MAC/do: Conf at %p: Use count is %u, expected %u", - conf, use_count, expected); + panic("MAC/do: Configuration at %p: Use count is %u, " + "expected %u", conf, use_count, expected); } #else #define check_conf_use_count(...)