From nobody Fri Jan 16 00:24:18 2026 X-Original-To: dev-commits-src-all@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 4dsgZp4dMYz6NQ1Y for ; Fri, 16 Jan 2026 00:24:18 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dsgZp2MbQz3Zns for ; Fri, 16 Jan 2026 00:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768523058; 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=+UbqLzR4HiqP+N34HBUqrPl2Fmty2Ow5nIC6W8Xg/ok=; b=q7d9setSGOeBi/cfjnIAEgvxY/kEfyxvFaUwJfBISfIu3FmmEs0/CaOfBfqM0u5E9lXLcw uoTY6uYlbITx6QQtKfci7zusLKiakd96lT+iwDbJ0xiybkGqCbNQJaWyFzVSjigbkOeamD LLqze2YeswaX56cmk528AYNb+KRDE5ohBWlJNtexCjbBG5+XUX1O4Dtu28TnLMJsQQ98O4 AjZncTr3U48pVBJgbv5e3XJjW2YCMWgoY1N0WzDdVsFVUN9XZf4yPHbLzsJSSZARMFBveo UrRxoBUsUaN1l0P13l60cWALztoM9/0OIzrrLMQf0BSUirgLfa4cJf/1bMtiJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768523058; 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=+UbqLzR4HiqP+N34HBUqrPl2Fmty2Ow5nIC6W8Xg/ok=; b=CSY8pDGf/+oGXKGzcxT1Pki5W9DxEr+hZiGOYxvGSSBtBOUJ/Hl4Twgq+0e/I6zpShvLbN SkQasp7HFKohSph2PSxyPaOMFcXQr/pTp8Jp8gSq6k6CW5W+AJ/Ln24sFwYc9JTOp/CW7Q TgGWnXPLPe/FvdBuaqJVz/T5kHqffWxKDtnDm3HLSjVVAknCg2Y0qyeFMtaJryDzXEm6v/ EJlPOQf1iaOuQDQHhfrWhm+MPw/MpMx50PYiIDGqjcIXLgz4qV2gH0fWUkFgowwYjhn37k OfdivO7muAe0HQPyf9Kr2MQk5DTnomcKVKrHCf0eBRgO9jNycK59jadOKl2htw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768523058; a=rsa-sha256; cv=none; b=OTZfedSebS7plv0wCNdSh2VIQeAEFtzhwogPPRvsMcZqWIGwPnYRz7UoUj32bCYM2EmHpr sgYpeA45V8WQsvqTMgB7iaGd/Wu7m9f1uT11f9WMBA9Cugvo2qYzVK1z0hXdyVpDdayrxo 2Qb9v73p6VE3SGgK5bzJETVZatSYuVUrbCaeHX8QKr8vd3yBQ4slCgK/hXX3gk5iv7ikRs Y/cdsm0bbhOELpMjCTQwPjgz/TQyow/nIL/BQP1+hoVziyR2bqKiwT/vgUQfNZTI1sD6KI 3Mc+6qGcpq4iNvEhSUqPWhrb0LbcBsC4Xki0thoiO5sWbsxifl3az5mulOQbqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dsgZp1xsHzrpy for ; Fri, 16 Jan 2026 00:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3abde by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Jan 2026 00:24:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 92b7366e438d - main - mac: add macros for 5-argument SDT probes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92b7366e438d8422a9e453aed02ca365da25bf62 Auto-Submitted: auto-generated Date: Fri, 16 Jan 2026 00:24:18 +0000 Message-Id: <69698532.3abde.70dc1b52@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=92b7366e438d8422a9e453aed02ca365da25bf62 commit 92b7366e438d8422a9e453aed02ca365da25bf62 Author: Kyle Evans AuthorDate: 2026-01-11 17:12:49 +0000 Commit: Kyle Evans CommitDate: 2026-01-16 00:23:39 +0000 mac: add macros for 5-argument SDT probes A last-minute change to the jail MAC entry points in D53954 is going to pass the jail_[gs]et(2) flags to mac_prison_check_[gs]et() so that a policy can, e.g., reject or allow a change if the intent is to immediately attach, or disallow some fetching of dying jails. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54658 --- sys/security/mac/mac_internal.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h index a882a476d1b0..a07bf01da6f6 100644 --- a/sys/security/mac/mac_internal.h +++ b/sys/security/mac/mac_internal.h @@ -64,6 +64,12 @@ SDT_PROVIDER_DECLARE(mac); /* MAC Framework-level events. */ SDT_PROVIDER_DECLARE(mac_framework); /* Entry points to MAC. */ +#define MAC_CHECK_PROBE_DEFINE5(name, arg0, arg1, arg2, arg3, arg4) \ + SDT_PROBE_DEFINE6(mac_framework, , name, mac__check__err, \ + "int", arg0, arg1, arg2, arg3, arg4); \ + SDT_PROBE_DEFINE6(mac_framework, , name, mac__check__ok, \ + "int", arg0, arg1, arg2, arg3, arg4); + #define MAC_CHECK_PROBE_DEFINE4(name, arg0, arg1, arg2, arg3) \ SDT_PROBE_DEFINE5(mac_framework, , name, mac__check__err, \ "int", arg0, arg1, arg2, arg3); \ @@ -88,18 +94,20 @@ SDT_PROVIDER_DECLARE(mac_framework); /* Entry points to MAC. */ SDT_PROBE_DEFINE2(mac_framework, , name, mac__check__ok, \ "int", arg0); -#define MAC_CHECK_PROBE4(name, error, arg0, arg1, arg2, arg3) do { \ +#define MAC_CHECK_PROBE5(name, error, arg0, arg1, arg2, arg3, arg4) do { \ if (SDT_PROBES_ENABLED()) { \ if (error) { \ - SDT_PROBE5(mac_framework, , name, mac__check__err,\ - error, arg0, arg1, arg2, arg3); \ + SDT_PROBE6(mac_framework, , name, mac__check__err,\ + error, arg0, arg1, arg2, arg3, arg4); \ } else { \ - SDT_PROBE5(mac_framework, , name, mac__check__ok,\ - 0, arg0, arg1, arg2, arg3); \ + SDT_PROBE6(mac_framework, , name, mac__check__ok,\ + 0, arg0, arg1, arg2, arg3, arg4); \ } \ } \ } while (0) +#define MAC_CHECK_PROBE4(name, error, arg0, arg1, arg2, arg3) \ + MAC_CHECK_PROBE5(name, error, arg0, arg1, arg2, arg3, 0) #define MAC_CHECK_PROBE3(name, error, arg0, arg1, arg2) \ MAC_CHECK_PROBE4(name, error, arg0, arg1, arg2, 0) #define MAC_CHECK_PROBE2(name, error, arg0, arg1) \