From nobody Tue May 27 09:21:44 2025 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 4b66Zx0Pwrz5xB3Y; Tue, 27 May 2025 09:21:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b66Zw4lghz3Swx; Tue, 27 May 2025 09:21:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748337704; 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=3DU+ObKp3ErAEo1LVlLZgWGeRmcav7FRNiNMwJvc2Yw=; b=G8ut5WFG2A31FKHwhC/jOUgiMQQu03TMZta3EAqZM6KUv4Ls2fukKzRYf3e95D1hye07VJ uayNyppHjWfb4GoSWyWkVZW03PilU7fxeWn+Ll3PaPbxgbxGU6fjWdj2MZiypzwFtSlvpN Pi2f2JOYZXUFrzlFmH72POhVA4JJtECqOmQkYGIznUBtn+GRcp7AbvL1KsHOL//5bJl3k6 LNHmsjW3A1dFPdalOWZJ70NEwDtp46Qt/ww35H3FxMZkRf5LD3T9u1rXIFozP708qAXWWp SBPV06EVZm1Vrt7L3QHKJxaG5OC29i8Roy9VrON4ALZbwzhXJ6yDsG1FDY+yhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748337704; a=rsa-sha256; cv=none; b=XlaIUI4UcICt5zBceMpW+5/Iur/bi8fuT4KjVklL1igHATKOxvQsvJLQsSZ9esbavDfFhl d7V+ZRJDUJyIewaGXzt9EXNV4M20yU27Tt74tTcp5/epUasv7Q1vYXhRFPGDekEZYSW8mc fBk00OHQqrO5i8wYPY17zqlQm8RirqGJzlGkumHaAVcpY1j1WsxZ4f3roC2MyShCVFtE0S q1w0zJFdSkCmKfnUKRQOYJdWBcRXLrhZajGLHul5+T7RL+UCW+MpFZ/Mf5I/MSmMtYS1HZ Is9WFIleY745Oz5NqFv/Q2Ve7Ew0YxZNq/8U/ss0mnKCr0nwheFMqt4UnujhDA== 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=1748337704; 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=3DU+ObKp3ErAEo1LVlLZgWGeRmcav7FRNiNMwJvc2Yw=; b=XwsLDdZRXPip/G4Bde/P1L70m+OM8qzrGQyQ2YZZfTgXSZqq41TjMVNzK+9Z17xRfTAKdI i+YoQeJIh+mGYIu6yubRnxz+NUTV6udtEjVrGbpU9x6s2NPdc7Q4stcbvbetap78q4ljrV q9QNczjH89k6weMUw2NmhBKp7BD7qCKT+JzgRpgw8FFsbBGShnoUzN8Cj3SceqRbiPHBBF qGrLE7+V/aAKEo3EeHEvNhO6XHf1k2Yp3jLBjMwNZ0W5asN0pSL3IsVjh4QgOrjxd3JRAs sLb6Azo9pseYEwWnprLuhj5kbIFgK7NKmUDwJAHfNsll8xVyEtfv/LIIKJ5GSw== 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 4b66Zw491bzmyv; Tue, 27 May 2025 09:21:44 +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 54R9LiVN041717; Tue, 27 May 2025 09:21:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54R9LibL041714; Tue, 27 May 2025 09:21:44 GMT (envelope-from git) Date: Tue, 27 May 2025 09:21:44 GMT Message-Id: <202505270921.54R9LibL041714@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: b5c9889e369a - main - MAC/do: Fix a too stringent debug assertion for a target of 'uid=*' 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 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: b5c9889e369a801ce7c1115f2535ddacbd69800d Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b5c9889e369a801ce7c1115f2535ddacbd69800d commit b5c9889e369a801ce7c1115f2535ddacbd69800d Author: Olivier Certner AuthorDate: 2025-05-27 08:20:06 +0000 Commit: Olivier Certner CommitDate: 2025-05-27 09:20:07 +0000 MAC/do: Fix a too stringent debug assertion for a target of 'uid=*' MDF_HAS_PRIMARY_CLAUSE only concerns groups, not users, and is thus not set in the latter case. This change only has an effect on INVARIANTS builds. PR: 287057 MFC after: 10 minutes Sponsored by: The FreeBSD Foundation --- sys/security/mac_do/mac_do.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index a83c194b24ae..9aeafa62b56d 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -258,7 +258,8 @@ check_type_and_type_flags(const id_type_t type, const flags_t flags) "groups specification are exclusive"; goto unexpected_flags; } - if (((flags & MDF_PRIMARY) != 0 || (flags & MDF_ANY) != 0) && + if (type == IT_GID && + ((flags & MDF_PRIMARY) != 0 || (flags & MDF_ANY) != 0) && (flags & MDF_HAS_PRIMARY_CLAUSE) == 0) { str = "Presence of folded primary clause not reflected " "by presence of MDF_HAS_PRIMARY_CLAUSE";