From nobody Tue May 27 21:02:55 2025 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 4b6Q7z4CR5z5xtcG; Tue, 27 May 2025 21:02:55 +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 4b6Q7z3m7hz3fm7; Tue, 27 May 2025 21:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748379775; 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=bzOoXakW2Kp0U/2CObbiEJNv5ymld3nmmjhwRbaLxTc=; b=fElXqoSIA+W+Z1oPrwuChfxcPldeo5rs6iPo5LcBO4deiA3je16x4QOTiE0hyOGqCgh3c/ wpd3Whygt9mrNhZjZwIA6w2eK/kCpeoYhWsLooa65pQkPa+PE80gOa1Rd7WyGOD+4wQMXq 5TmxT5XZzbsC9vh1v0FZO+tmJ1hAmTpEW2T5wOqbZVD1uiusJkxkUpaqmrMyE8Wq3tIHA6 I4nauzHOqNm9BhyzkFcOLQX1ZM5TMsGLmILNn79m8sqLrCxYkW5WJ50M2e8lzDj8bFGXVp vFcOH4qP+ye99e/3eEBgr6IMldVgDOkL+f5IZDVQ+1hz+xbWfyl9mvktIFibEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748379775; a=rsa-sha256; cv=none; b=wtZYxQhb/hYvUTO1TCztiLMykl3ZkBsOf/9O287yY0qSSWZLyT+OY1KSWoNCDA9LCIDEFS GLjHzN0qf2lQPVf+4cGp5j53IJjKdrroqlXwGYveepO++EphFmpkYL/WMI8NYKaduu64in kENvUQFoxUQb2BtZxvFmAwD4rk9EJdNgUNdSO8Pm8pNNSFCCZwgnuo6//M+V77ZtJLH6ri iRnehTB/l+vazwXEs0xKR7BX44r6035nLT303HefsKAnjDZ2rI2QdGL1dMCh+dkjw/VsE/ yCzs1i0K0XJi+3gv+r9IKhCQcelApuavUNhOjyWmovYoj+OVp7LdfhlmSNsYkg== 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=1748379775; 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=bzOoXakW2Kp0U/2CObbiEJNv5ymld3nmmjhwRbaLxTc=; b=gWs43MVRzhccnKzh80AB2ylIoHDWVgAaajETO6oAIrVd6hbdUSAF12CBI51Cb0JB24jWgn QsEvAGW8kIVeXL4tpDkbHZ7EdKVw4nAIQrmiD+Xjdgw02hFYZDv24AWVB/sM4KrvYGRtGs b3L2/CusjQkIBCruPAGnm7nXkGabodEbCqEk4uFDmCv9o18npQYOcGFTpELGmp6DUUF3hK Hq3CLWHFGYaXs6YcDOAMnVF1FMNe4Y6bbvu6t2djxuaOVd36eTkfveOpHdNNTtAgoyzPXU ssk3wTmU/t3Xbe8IR1tGZsYHxBFGJ5CwX4g41uhIGrYjVl1stBApNNRCtxmHuQ== 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 4b6Q7z2lcBz17MV; Tue, 27 May 2025 21:02:55 +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 54RL2t8j061270; Tue, 27 May 2025 21:02:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RL2tkM061267; Tue, 27 May 2025 21:02:55 GMT (envelope-from git) Date: Tue, 27 May 2025 21:02:55 GMT Message-Id: <202505272102.54RL2tkM061267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: adc6f56e81aa - releng/14.3 - MAC/do: Fix a too stringent debug assertion for a target of 'uid=*' 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 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/releng/14.3 X-Git-Reftype: branch X-Git-Commit: adc6f56e81aaca05b8ab72f07a8de6b69d9fe498 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=adc6f56e81aaca05b8ab72f07a8de6b69d9fe498 commit adc6f56e81aaca05b8ab72f07a8de6b69d9fe498 Author: Olivier Certner AuthorDate: 2025-05-27 08:20:06 +0000 Commit: Olivier Certner CommitDate: 2025-05-27 21:01:54 +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 (cherry picked from commit b5c9889e369a801ce7c1115f2535ddacbd69800d) (cherry picked from commit 30f092c40ad4eb592861839f4ffa9e9891abf1d3) Approved by: re (cperciva) --- 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";