From owner-p4-projects@FreeBSD.ORG  Sat Oct 21 01:28:53 2006
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 4A63116A417; Sat, 21 Oct 2006 01:28:53 +0000 (UTC)
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 F31D516A403
	for <perforce@freebsd.org>; Sat, 21 Oct 2006 01:28:52 +0000 (UTC)
	(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 6A53F43D49
	for <perforce@freebsd.org>; Sat, 21 Oct 2006 01:28:52 +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.6/8.13.6) with ESMTP id k9L1SqwW014473
	for <perforce@freebsd.org>; Sat, 21 Oct 2006 01:28:52 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9L1SpxV014470
	for perforce@freebsd.org; Sat, 21 Oct 2006 01:28:51 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 21 Oct 2006 01:28:51 GMT
Message-Id: <200610210128.k9L1SpxV014470@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 108205 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: Sat, 21 Oct 2006 01:28:53 -0000

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

Change 108205 by rwatson@rwatson_peppercorn on 2006/10/21 01:27:53

	Catch a couple more suser's specific to RELENG_6 -- vfs_init and
	pcvt (not present in 7.x).

Affected files ...

.. //depot/projects/trustedbsd/priv6/src/sys/i386/isa/pcvt/pcvt_drv.c#2 edit
.. //depot/projects/trustedbsd/priv6/src/sys/i386/isa/pcvt/pcvt_ext.c#2 edit
.. //depot/projects/trustedbsd/priv6/src/sys/i386/isa/pcvt/pcvt_hdr.h#2 edit
.. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_init.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/priv6/src/sys/i386/isa/pcvt/pcvt_drv.c#2 (text+ko) ====

@@ -302,7 +302,8 @@
 		ttyld_modem(tp, 1);	/* fake connection */
 		winsz = 1;			/* set winsize later */
 	}
-	else if (tp->t_state & TS_XCLUDE && suser(td))
+	else if (tp->t_state & TS_XCLUDE && priv_check(td,
+	    PRIV_TTY_EXCLUSIVE))
 	{
 		return (EBUSY);
 	}

==== //depot/projects/trustedbsd/priv6/src/sys/i386/isa/pcvt/pcvt_ext.c#2 (text+ko) ====

@@ -2620,7 +2620,7 @@
 	{
 		struct trapframe *fp = td->td_frame;
 
-		error = suser(td);
+		error = priv_check(td, PRIV_TTY_EXCLUSIVE);
 		if (error != 0)
 			return (error);
 		error = securelevel_gt(td->td_ucred, 0);

==== //depot/projects/trustedbsd/priv6/src/sys/i386/isa/pcvt/pcvt_hdr.h#2 (text+ko) ====

@@ -61,6 +61,7 @@
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
+#include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/random.h>
 #include <sys/signalvar.h>

==== //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_init.c#2 (text+ko) ====

@@ -42,6 +42,7 @@
 #include <sys/kernel.h>
 #include <sys/linker.h>
 #include <sys/mount.h>
+#include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
@@ -115,7 +116,7 @@
 		return (vfsp);
 
 	/* Only load modules for root (very important!). */
-	*error = suser(td);
+	*error = priv_check(td, PRIV_KLD_LOAD);
 	if (*error)
 		return (NULL);
 	*error = securelevel_gt(td->td_ucred, 0);