From nobody Wed Oct 18 16:29:54 2023 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 4S9bsv2Hn5z4xF5D; Wed, 18 Oct 2023 16:29: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9bsv1mj4z4NPH; Wed, 18 Oct 2023 16:29:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697646595; 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=U0L8xJtFgX6Wy8HL4+7+X6dzg3NaK/xNsTrq10GJOIo=; b=ukZVgnzT7eXDvWDO1+yT9CLQTXyS72bB1WXhNY7yh990+yTUIiR2N0hYX3ZF3r9YVBRmRU WfgwwnWs4pBqx7TEdI/F/vu9+IbFt9jvVRjPdhXxMDX0mXTm15c27WQoUom2Uqq3m230oJ XMgjksIf/6HB+o5xfmo61Q79XFgOYVnHhOO/Q6NnsrfYCXBUe1uoBv1hMJyvGBB7myLCBK njPp9OSi22SURb8ukiEnzcy2yoljLwAx3AfN2YrKESAVq8hy3XR9cadfa/VoKrBvn1xVlr Zu7WVa9lgOhUkp9lfjdhxQvyLTRWOYgTPG2zjVH5s3o9awpeCA1M8n059pPPHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697646595; a=rsa-sha256; cv=none; b=Xyox5IxpEEry1yT7Xs+bMBazF26G4xZ6EwQSZBkcGpDZnbh62XjNX9LeKepm3nw5yfIKze EcVQKEKp/laCUPIzFiAxXe5OE1Xh5AA/RPwzqRDan3CVeQJ7Iwi8+ggIAvuwUqjluIr8pd uTWli08nnyq2mm7qvyeZGVD45Jx2UiKcvG2t1aT07cZoSzhmYTBLpAlioV0pwfJLkJdIpT a4mmVOdnaS/iQUOFz/n/kJsV0Kx72iP6mryHDgQt9bz/dhSKT4LW1sID7nrk6tO6qx0vrt 2KFpmXqx+Du2pgl7iVONLDNcaM7HfarmoZy79q03o+TR9rPFBRw30ckDvHCLJg== 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=1697646595; 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=U0L8xJtFgX6Wy8HL4+7+X6dzg3NaK/xNsTrq10GJOIo=; b=PJlQeswxJXXeZ02yWwPfGNR3jMh1ijtfb3bMSXv1/LbyUY67KwnyrbcPyv+nM/XHjGwf02 RrhY2I+Hq65NBHx0NRmxL1o2nUU6IyDbZZxfrhnPnWMUY9Q/vcqgQESGTOjML0T/E2pmXa wgt/AYT9eP1+DjrOOdv8ewWe4m1iw+f2WPyAjaQ8nF8CIz1ztHrO9A9rQSe+VFJkmgL02q XIVypygGB9FdBZyO9lcYEG69+K53ILwuUsJZzaZQG2XZixobRApKSuAgIqVK4/zr50mY2P +Gt3SP5mGKeYmmXrHgQguuohyJ0VGv2h+/7TxsXgRkPCCbUqWqmCLq38xiLzrw== 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 4S9bsv0XVRz1Cst; Wed, 18 Oct 2023 16:29:55 +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 39IGTso6078066; Wed, 18 Oct 2023 16:29:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IGTsBY078063; Wed, 18 Oct 2023 16:29:54 GMT (envelope-from git) Date: Wed, 18 Oct 2023 16:29:54 GMT Message-Id: <202310181629.39IGTsBY078063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 07c60e63237e - stable/14 - Make cr_bsd_visible()'s sub-functions internal 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 07c60e63237e1d4657cfbd6b03116c4913827e8c Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=07c60e63237e1d4657cfbd6b03116c4913827e8c commit 07c60e63237e1d4657cfbd6b03116c4913827e8c Author: Olivier Certner AuthorDate: 2023-08-17 23:54:39 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 16:24:48 +0000 Make cr_bsd_visible()'s sub-functions internal cr_canseeotheruids(), cr_canseeothergids() and cr_canseejailproc() should not be used directly now. cr_bsd_visible() has to be called instead. Reviewed by: mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40629 (cherry picked from commit 91e9d669b475d1900e8dc01a49ad90a621c4a068) --- sys/kern/kern_prot.c | 10 +++++++--- sys/sys/proc.h | 3 --- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 14b19837d5dc..00eb2fccdeef 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -91,6 +91,10 @@ static void crfree_final(struct ucred *cr); static void crsetgroups_locked(struct ucred *cr, int ngrp, gid_t *groups); +static int cr_canseeotheruids(struct ucred *u1, struct ucred *u2); +static int cr_canseeothergids(struct ucred *u1, struct ucred *u2); +static int cr_canseejailproc(struct ucred *u1, struct ucred *u2); + #ifndef _SYS_SYSPROTO_H_ struct getpid_args { int dummy; @@ -1371,7 +1375,7 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_other_uids, CTLFLAG_RW, * References: *u1 and *u2 must not change during the call * u1 may equal u2, in which case only one reference is required */ -int +static int cr_canseeotheruids(struct ucred *u1, struct ucred *u2) { @@ -1401,7 +1405,7 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_other_gids, CTLFLAG_RW, * References: *u1 and *u2 must not change during the call * u1 may equal u2, in which case only one reference is required */ -int +static int cr_canseeothergids(struct ucred *u1, struct ucred *u2) { if (!see_other_gids) { @@ -1440,7 +1444,7 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_jail_proc, CTLFLAG_RW, * References: *u1 and *u2 must not change during the call * u1 may equal u2, in which case only one reference is required */ -int +static int cr_canseejailproc(struct ucred *u1, struct ucred *u2) { if (see_jail_proc || /* Policy deactivated. */ diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 8609bbd124ad..0b91b2a1a0b5 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1166,9 +1166,6 @@ struct thread *choosethread(void); int cr_bsd_visible(struct ucred *u1, struct ucred *u2); int cr_cansee(struct ucred *u1, struct ucred *u2); int cr_canseesocket(struct ucred *cred, struct socket *so); -int cr_canseeothergids(struct ucred *u1, struct ucred *u2); -int cr_canseeotheruids(struct ucred *u1, struct ucred *u2); -int cr_canseejailproc(struct ucred *u1, struct ucred *u2); int cr_cansignal(struct ucred *cred, struct proc *proc, int signum); int enterpgrp(struct proc *p, pid_t pgid, struct pgrp *pgrp, struct session *sess);