From owner-p4-projects@FreeBSD.ORG  Mon Nov 21 19:17:15 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 9182716A422; Mon, 21 Nov 2005 19:17:14 +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 6A55016A41F
	for <perforce@freebsd.org>; Mon, 21 Nov 2005 19:17:14 +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 2FFF843D58
	for <perforce@freebsd.org>; Mon, 21 Nov 2005 19:17:11 +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 jALJHB5f066377
	for <perforce@freebsd.org>; Mon, 21 Nov 2005 19:17:11 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jALJHAKw066374
	for perforce@freebsd.org; Mon, 21 Nov 2005 19:17:10 GMT
	(envelope-from millert@freebsd.org)
Date: Mon, 21 Nov 2005 19:17:10 GMT
Message-Id: <200511211917.jALJHAKw066374@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 87034 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, 21 Nov 2005 19:17:15 -0000

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

Change 87034 by millert@millert_ibook on 2005/11/21 19:16:24

	Pull in a fix from DSEP (wsalamon).  The mac_check_fcntl() 
	function takes a pointer to the file struct, not the filedesc
	struct, as its second parameter.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/kern_descrip.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/kern_descrip.c#4 (text+ko) ====

@@ -262,7 +262,7 @@
 	pop = &fdp->fd_ofileflags[fd];
 
 #ifdef MAC
-	error = mac_check_fcntl(p->p_ucred, fdp, uap->cmd, uap->arg);
+	error = mac_check_fcntl(p->p_ucred, fp, uap->cmd, uap->arg);
 	if (error)
 		return (error);
 #endif