From owner-p4-projects@FreeBSD.ORG  Mon Nov  7 15:29:29 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 4BECC16A421; Mon,  7 Nov 2005 15:29:29 +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 ECFE516A41F
	for <perforce@freebsd.org>; Mon,  7 Nov 2005 15:29:28 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BA75243D45
	for <perforce@freebsd.org>; Mon,  7 Nov 2005 15:29:28 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA7FTSda096846
	for <perforce@freebsd.org>; Mon, 7 Nov 2005 15:29:28 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA7FTSHU096843
	for perforce@freebsd.org; Mon, 7 Nov 2005 15:29:28 GMT
	(envelope-from millert@freebsd.org)
Date: Mon, 7 Nov 2005 15:29:28 GMT
Message-Id: <200511071529.jA7FTSHU096843@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 86420 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, 07 Nov 2005 15:29:30 -0000

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

Change 86420 by millert@millert_ibook on 2005/11/07 15:29:26

	Don't try to deref curproc if it is NULL

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#7 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#7 (text+ko) ====

@@ -555,9 +555,10 @@
                struct av_decision *avd, int result, struct avc_audit_data *a)
 {
 #ifdef __APPLE__
-	struct proc *curproc = current_proc();
+	struct proc *tsk = current_proc();
+#else
+	struct proc *tsk = curproc;
 #endif
-	struct proc *tsk = curproc;
 	access_vector_t denied, audited;
 
 	denied = requested & ~avd->allowed;
@@ -608,11 +609,10 @@
 				struct vnode *vp = a->u.fs.vp;
 				struct vattr va;
 #ifdef __APPLE__
-				struct proc *curproc = current_proc();
-				if (/*VOP_ISLOCKED(vp) &&*/
+				if (tsk && /*VOP_ISLOCKED(vp) &&*/
 				    !VOP_GETATTR(vp, &va,
-						 curproc->p_ucred,
-						 curproc)) {
+						 tsk->p_ucred,
+						 tsk)) {
 #else
 				if (VOP_ISLOCKED(vp, curthread) &&
 				    !VOP_GETATTR(vp, &va,