From nobody Thu Dec 21 13:43:22 2023 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 4Sws8C0Xkbz54pTn; Thu, 21 Dec 2023 13:43:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sws8B6rVSz4NHr; Thu, 21 Dec 2023 13:43:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703166203; 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=9Xq5NMtSrOcpnM6SEF4N2/b67OU96Aw3TckktWXQoFs=; b=OqN4+ax9+Fmbl8ksipoE77ySVrQFZfmvjkPO9cBE3IgTEK4YRNQH2G276mnZNB4HPK2gAw gyY6OSp4HGCgvq4hC7a3uE8i2F7lQSDelgK4e0+z0KZJJg8vi+Wu7giYiusgGgF4eAeV+U FFEti5gUxPeYt3TIe7jQ8qV5RfAlFGNm1R4KdesImMSPUWfiIubYH/VqT/Q2fa+2LBdtMH 18Vrg3U7KUvnqGEwLbtHfZEBsQVtuisPCgjNfgvynQHrEanF48mB8yh6cdRHsgYYd1T7zp eD77xwp3E4kiO+oZ4WB6DgvmvqKMfQmQQu+l5hxyYOIv1AXBD3fqQNMpwtFeHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703166203; a=rsa-sha256; cv=none; b=jCy9p1Lm4UIwbrb/jb1jKYb4W9Brk8n/JQ8xChpDICPwnwWYZjbjSDyz9wPw33XVp6DNto 4BE6KxL3zGG7lEKxiCU4XiEWnDg7nXlTyB5/oS5do2pvtSMCMp4Uq3w5Nc1ksX5ihGtnuX SI9pCa26p6CHXohoe5Jad+fvEHDk+NCaURBRlt2KpLgpkH+4Ld+YbT6E84+PuBHlJCwZqU KNYrx8veLOcm2/qAEYAyLH7KlVWfUFKeRw4EegHQkrtHr+4yFnQ79frfBIGyZZvdd6AylD BHRDv1L+08BG+rrKIliVk1s2nC7+xUMw30iXBJtHGD6R2iE4l6dFRSlzIZkh2w== 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=1703166203; 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=9Xq5NMtSrOcpnM6SEF4N2/b67OU96Aw3TckktWXQoFs=; b=wN0eRyFW/R65q5Kbji/2MkDxSzPXd/lH8bk2ZN2lUz8Ldnfmv6MaeY6RBNFz9n4FMiGsdq sdn70PGBpenggPsKjF+4BBnN+XkEqKX3te/ZoBUXVz1Gr/fAVkq82/Q9JvimOBI/NgXzPg G0X2eUeL/NCIF2Ksrd+TR3SdCfaNBBfXMR5/yGryOGxn0o3Qg/1ZgxTPmkDE/QRn/ZV9ne YeG4YGT8SxH0EBTs1dEYQyOkYvrgsfLXF0XS9t6RfpT2bWqfKQCKyGrpROeOn8ifuWNdjo 9VsMiXnUXO55q3eJ0hzEs83sMdmV1eLjOk7b9NInsMVj8H5oBapb2yqUQJpfPQ== 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 4Sws8B5xp1zZmH; Thu, 21 Dec 2023 13:43:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BLDhM4U078584; Thu, 21 Dec 2023 13:43:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BLDhMYS078581; Thu, 21 Dec 2023 13:43:22 GMT (envelope-from git) Date: Thu, 21 Dec 2023 13:43:22 GMT Message-Id: <202312211343.3BLDhMYS078581@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: d40c6fa7db7d - stable/13 - cr_canseejailproc(): New privilege, no direct check for UID 0 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: d40c6fa7db7d36d5c5f00648a73f17b273ab6bcb Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d40c6fa7db7d36d5c5f00648a73f17b273ab6bcb commit d40c6fa7db7d36d5c5f00648a73f17b273ab6bcb Author: Olivier Certner AuthorDate: 2023-08-17 23:54:37 +0000 Commit: Olivier Certner CommitDate: 2023-12-21 13:36:00 +0000 cr_canseejailproc(): New privilege, no direct check for UID 0 Use priv_check_cred() with a new privilege (PRIV_SEEJAILPROC) instead of explicitly testing for UID 0 (the former has been the rule for almost 20 years). As a consequence, cr_canseejailproc() now abides by the 'security.bsd.suser_enabled' sysctl and MAC policies. Update the MAC policies Biba and LOMAC, and prison_priv_check() so that they don't deny this privilege. This preserves the existing behavior (the 'root' user is not restricted, even when jailed, unless 'security.bsd.suser_enabled' is not 0) and is consistent with what is done for the related policies/privileges (PRIV_SEEOTHERGIDS, PRIV_SEEOTHERUIDS). Reviewed by: emaste (earlier version), mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40626 (cherry picked from commit 7974ca1cdbee949f5e453eea112be265b425c407) Approved by: markj (mentor) --- sys/kern/kern_jail.c | 1 + sys/kern/kern_prot.c | 7 +++++-- sys/security/mac_biba/mac_biba.c | 1 + sys/security/mac_lomac/mac_lomac.c | 1 + sys/sys/priv.h | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index d03612e43c52..9a9371f8591d 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3614,6 +3614,7 @@ prison_priv_check(struct ucred *cred, int priv) */ case PRIV_SEEOTHERGIDS: case PRIV_SEEOTHERUIDS: + case PRIV_SEEJAILPROC: /* * Jail implements inter-process debugging limits already, so diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index a405acfee433..8b56ba3f8846 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1428,9 +1428,12 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_jail_proc, CTLFLAG_RW, int cr_canseejailproc(struct ucred *u1, struct ucred *u2) { - if (u1->cr_uid == 0) + if (see_jail_proc || /* Policy deactivated. */ + u1->cr_prison == u2->cr_prison || /* Same jail. */ + priv_check_cred(u1, PRIV_SEEJAILPROC) == 0) /* Privileged. */ return (0); - return (!see_jail_proc && u1->cr_prison != u2->cr_prison ? ESRCH : 0); + + return (ESRCH); } /*- diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c index b175e57b2812..2d0df254f94c 100644 --- a/sys/security/mac_biba/mac_biba.c +++ b/sys/security/mac_biba/mac_biba.c @@ -1924,6 +1924,7 @@ biba_priv_check(struct ucred *cred, int priv) */ case PRIV_SEEOTHERGIDS: case PRIV_SEEOTHERUIDS: + case PRIV_SEEJAILPROC: break; /* diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c index 8cd9fcf190c6..761214db07e4 100644 --- a/sys/security/mac_lomac/mac_lomac.c +++ b/sys/security/mac_lomac/mac_lomac.c @@ -1692,6 +1692,7 @@ lomac_priv_check(struct ucred *cred, int priv) */ case PRIV_SEEOTHERGIDS: case PRIV_SEEOTHERUIDS: + case PRIV_SEEJAILPROC: break; /* diff --git a/sys/sys/priv.h b/sys/sys/priv.h index e0e8d98f294a..9e6d876be874 100644 --- a/sys/sys/priv.h +++ b/sys/sys/priv.h @@ -105,6 +105,7 @@ #define PRIV_CRED_SETRESGID 58 /* setresgid. */ #define PRIV_SEEOTHERGIDS 59 /* Exempt bsd.seeothergids. */ #define PRIV_SEEOTHERUIDS 60 /* Exempt bsd.seeotheruids. */ +#define PRIV_SEEJAILPROC 61 /* Exempt from bsd.see_jail_proc. */ /* * Debugging privileges.