From owner-p4-projects@FreeBSD.ORG  Mon Jul  4 11:00:35 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 80FF816A420; Mon,  4 Jul 2005 11:00:34 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5534216A41C
	for <perforce@freebsd.org>; Mon,  4 Jul 2005 11:00:34 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3FC4743D49
	for <perforce@freebsd.org>; Mon,  4 Jul 2005 11:00:34 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j64B0UXC091273
	for <perforce@freebsd.org>; Mon, 4 Jul 2005 11:00:30 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j64B0Tsu091267
	for perforce@freebsd.org; Mon, 4 Jul 2005 11:00:29 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 4 Jul 2005 11:00:29 GMT
Message-Id: <200507041100.j64B0Tsu091267@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79529 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 11:00:35 -0000

http://perforce.freebsd.org/chv.cgi?CH=79529

Change 79529 by rwatson@rwatson_paprika on 2005/07/04 11:00:13

	Convert some new suser() calls into cap_check() calls.
	
	In the fork() case, we might want CAP_SYS_RESOURCE instead.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/kern_fork.c#12 edit
.. //depot/projects/trustedbsd/sebsd/sys/kern/kern_prot.c#13 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_fork.c#12 (text+ko) ====

@@ -286,7 +286,7 @@
 	sx_xlock(&allproc_lock);
 	uid = td->td_ucred->cr_ruid;
 	if ((nprocs >= maxproc - 10 &&
-	    suser_cred(td->td_ucred, SUSER_RUID) != 0) ||
+	    cap_check_cred(td->td_ucred, CAP_SYS_ADMIN, SUSER_RUID) != 0) ||
 	    nprocs >= maxproc) {
 		error = EAGAIN;
 		goto fail;

==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_prot.c#13 (text+ko) ====

@@ -548,7 +548,8 @@
 #ifdef POSIX_APPENDIX_B_4_2_2	/* Use the clause from B.4.2.2 */
 	    uid == oldcred->cr_uid ||
 #endif
-	    suser_cred(oldcred, SUSER_ALLOWJAIL) == 0) /* we are using privs */
+	    /* we are using privs */
+	    cap_check_cred(oldcred, CAP_SETUID, SUSER_ALLOWJAIL) == 0)
 #endif
 	{
 		/*
@@ -709,7 +710,8 @@
 #ifdef POSIX_APPENDIX_B_4_2_2	/* use the clause from B.4.2.2 */
 	    gid == oldcred->cr_groups[0] ||
 #endif
-	    suser_cred(oldcred, SUSER_ALLOWJAIL) == 0) /* we are using privs */
+	    /* we are using privs */
+	    cap_check_cred(oldcred, CAP_SETGID, SUSER_ALLOWJAIL) == 0)
 #endif
 	{
 		/*
@@ -1454,7 +1456,8 @@
 				break;
 		}
 		if (!match) {
-			if (suser_cred(u1, SUSER_ALLOWJAIL) != 0)
+			if (cap_check_cred(u1, CAP_SYS_ADMIN,
+			    SUSER_ALLOWJAIL) != 0)
 				return (ESRCH);
 		}
 	}