From nobody Fri May 29 16:01:41 2026 X-Original-To: dev-commits-src-main@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 4gRp515mzkz6flVL for ; Fri, 29 May 2026 16:01:41 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gRp510sMxz3HSG for ; Fri, 29 May 2026 16:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780070501; 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=qs2ktg24z9KFQOsT8rCIrDXJthUBb9JjXDV+BlkyOLg=; b=eRZF9Auuv6qF9GNEMQMS3hy+uWtvRIlbpW2lXIbCctIvyzJHmouLLTMKeXxAZcgcz+8GGJ Dzk50e1mNjW6t4KGYFfNCr5nSBKg92tYEGhIsI1YUj07ghJx6JxDw71EWfmJZUqI8OdOml A0S/HO2Ygh/VEV7Kh+6HJDO7JNUN7mtYkIgDL767ri2m2wTvUdNTrp3A2wcvjDwMoDzT6J XUTU5P7miHfGucp3hQHPIjEkGwa0Csn6Ed6teQE9BGstsAx7Ybci2bSxs/ZPPkpQDOKhwr 9k2fF6j0+1Rcx7C5dIllqNSn95JjIB2hXgQztYs5hcRrtXeobAIWSkgWEIEcgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780070501; a=rsa-sha256; cv=none; b=MCz0fnrc2D+8rmKLL3P5g0gNqtXMM4c/minzbzARNHdtf4BOXyptYedfUmSKvqAgaJRjOb hmMvBErq06awxA3QFgm+0F8vwKHXUYHbAVVhmIKu52M6DScxKk18Cj1EgWhtOf97StKwsx iVRRgoHK3NVJDpYS6mIqtQA8VRFeRp7lay62tyAUXK6RQnIenLUyeiS9ERZ7ezs47bFWm3 2GBrEfXbDX2o+cNEcukAPZET5zu2ZLoFa9y/EBG5KKPJRmOxaRGrGzWo+Is9BcvtPxRGQb sEghhbG8uGjwmqhiOgE4oGxodqX4rzKAMafyHqDsWyJGwdg0LaasYpo6UFIV8g== 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=1780070501; 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=qs2ktg24z9KFQOsT8rCIrDXJthUBb9JjXDV+BlkyOLg=; b=wVxU5nE1zVUR97kgN3myOC26JzaT0WffQvhthSbYD8YWGsKPHKtCsGHcrALbnMwDJRTjqq ctXWFBxkZSZPaaS5zphICGNc2Ls3e2+0LXjRDrMS9JnoK3VBWciMLtO8bvp56zI+O4/6/a mBfABs+A6hij0AJ7w/xDtDTtZMltZ7x3tY4S+SzLyA03LnzBZLMpDHS1Z1xIDbQamqLHpx CHMWjniX31mkpkFxRD4j60WGYWji8Un+UwesZSEpebYDlx8bk5AJHI5HIBS6tR+pASGrto ZB4vKgUAKpDsHJQDA4ON/UDWr0H3JVXHeO7GFKs26KC3uu/gOZP61mn5tyh0pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRp510Q1Xzg9D for ; Fri, 29 May 2026 16:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36528 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 16:01:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 4e27cc086b3f - main - MAC/do: Move static assertions on constants close to their definitions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4e27cc086b3f9e029160da8830abacb06a2f9e39 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 16:01:41 +0000 Message-Id: <6a19b865.36528.531ce00e@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=4e27cc086b3f9e029160da8830abacb06a2f9e39 commit 4e27cc086b3f9e029160da8830abacb06a2f9e39 Author: Olivier Certner AuthorDate: 2026-05-20 09:38:37 +0000 Commit: Olivier Certner CommitDate: 2026-05-29 15:22:43 +0000 MAC/do: Move static assertions on constants close to their definitions And document more clearly their purpose. Reviewed by: bapt MFC after: 1 month Sponsored by: The FreeBSD Foundation Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/38 --- sys/security/mac_do/mac_do.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 7a08cdd5425f..1d9b756bc0fc 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -47,10 +47,14 @@ SYSCTL_INT(_security_mac_do, OID_AUTO, print_parse_error, CTLFLAG_RWTUN, static MALLOC_DEFINE(M_MAC_DO, "mac_do", "mac_do(4) security module"); +#define MAX_RULE_STRING_SIZE 1024 +_Static_assert(MAX_RULE_STRING_SIZE > 0, + "MAX_RULE_STRING_SIZE: No space for the NUL terminator!"); + #define MAX_EXEC_PATHS_SIZE 2048 #define MAX_EXEC_PATHS 8 - -#define MAX_RULE_STRING_SIZE 1024 +_Static_assert(MAX_EXEC_PATHS_SIZE > 0, + "MAX_EXEC_PATHS_SIZE: No space for the NUL terminator!"); static unsigned osd_jail_slot; static unsigned osd_thread_slot; @@ -353,14 +357,12 @@ toast_rules(struct rules *const rules) static void init_rules(struct rules *const rules) { - _Static_assert(MAX_RULE_STRING_SIZE > 0, "MAX_RULE_STRING_SIZE <= 0!"); STAILQ_INIT(&rules->head); } static void init_exec_paths(struct exec_paths *const exec_paths) { - _Static_assert(MAX_EXEC_PATHS_SIZE > 0, "MAX_EXEC_PATHS_SIZE <= 0!"); bzero(exec_paths, sizeof(*exec_paths)); exec_paths->exec_paths_str[0] = 0; }