From nobody Thu Apr 3 19:32:32 2025 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 4ZTBhd2bsQz5sLwn; Thu, 03 Apr 2025 19:32:33 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZTBhc6VyMz3T5D; Thu, 03 Apr 2025 19:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708752; 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=N/l7Z8Q27vOehYMNQbwSHL23ceK0JM9bdTWrNDOOjaU=; b=iaZUTOiyh2Zc0d2ssInmD+Gwwd5b8gjRTI90cS1ZF8s7oBWsCUCaIjho7UqDpoHwHxRqBL a0A4ImTHYG8rmIkAaIVGHCUyqXkW/hPZFwbxOh9bIHYCcGvjLOB5jTKcuqpvtV2a5xSONt JGjAo7t5R3i3P8TJHJ/Txp9IiT81wngn8Vd0etbZoDaDtUxfrLSpmr0YbeLpcV4DMI1lTc TYlIZpAOyhtlkgzHX0qfD1YwBgtTZW0d4JHnz71IeRdL9AILjh7uzv5+A8v7ih+sl7OLz1 cKkr8IJd25XVE5qllzUDJHy+aPW7hgIsxBxw9k198qdDRv0dWOsdADwg0WDkhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743708752; a=rsa-sha256; cv=none; b=AFeOPY36gPMZk5NPCPZWfK8MbMgBLn9k9TCmWX7badpJ2SSvScrTPGR5UfyaHmN/pOqQqn 9pLUGtqKzf2BD2MaW7K11RpEYwOPyMHfK6gkOTk4hlU3+IoziY1HpPDE9vXnUtbQv/uN4u bBPnzt3J8FhuAYJFNTI8VFR9J+/iybzyg72a9xAQdQuybK1k6rJ1qLD2xslw1vRfS/agac nxle3RJYXfKsfJcP56Mko52M44bijItTL8ZpRwuz/zV5ItPq2a1rJ2Kk9nmTa+xwtsQpUy PFIMSPOZhHTxOA0EjCeiOqtrVewZHogejSkv6asXK47LmphtqoeTBNj02uiXow== 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=1743708752; 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=N/l7Z8Q27vOehYMNQbwSHL23ceK0JM9bdTWrNDOOjaU=; b=VmU8Z+eE3LCrFLU07avOscLaPTWfq1T8bC+EVSpHW5q60dTsihCupXiVcreo8qEXKDDvaY k8YLMB/7uNLmngdBPl6k4t5/h/O1jNr+1+dbClteNOKIolCl1sQD0t/eRJH1ddGEzSOXD5 rGrfr/zEBg+S8yiR1OuHHWH0iKBP+JfzCUGCsPiuMT9EHd/+EDWpFVOde2eloxBk5OVFtr irmyb02MPU0/yZbTUp66AIOeg6DBjcTzFCboky9JhTjkXUc5Na5rFVmHQ6VGaSwhzQ90JF XwuS+hmKoegUhfci/rgy9n8OgWLwkTSPn9QCdgUoxRsZkX+ujBQenmbkrAJQiA== 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 4ZTBhc5qWCzZv; Thu, 03 Apr 2025 19:32:32 +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 533JWW9R040679; Thu, 3 Apr 2025 19:32:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JWWLd040676; Thu, 3 Apr 2025 19:32:32 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:32:32 GMT Message-Id: <202504031932.533JWWLd040676@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: 8f72bcd9fd5d - stable/14 - MAC/do: Apply a rule on real UID/GID instead of effective ones 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8f72bcd9fd5d951fe673ca4c3dfef017f39c672e Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=8f72bcd9fd5d951fe673ca4c3dfef017f39c672e commit 8f72bcd9fd5d951fe673ca4c3dfef017f39c672e Author: Olivier Certner AuthorDate: 2024-11-29 14:39:17 +0000 Commit: Olivier Certner CommitDate: 2025-04-03 19:31:06 +0000 MAC/do: Apply a rule on real UID/GID instead of effective ones We intend MAC/do to authorize transitions based on the "real" identity information of the calling process, rather than transiently-acquired effective IDs. Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47845 (cherry picked from commit de701f9bdbe0ede691a0439d1c469082b94fe234) --- 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 44c33d7cfa57..7ec34b20c882 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -1906,9 +1906,9 @@ rule_grant_setcred(const struct rule *const rule, static bool rule_applies(const struct rule *const rule, const struct ucred *const cred) { - if (rule->from_type == IT_UID && rule->from_id == cred->cr_uid) + if (rule->from_type == IT_UID && rule->from_id == cred->cr_ruid) return (true); - if (rule->from_type == IT_GID && groupmember(rule->from_id, cred)) + if (rule->from_type == IT_GID && realgroupmember(rule->from_id, cred)) return (true); return (false); }