From owner-p4-projects@FreeBSD.ORG  Fri Aug 22 10:00:55 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8026216A4C1; Fri, 22 Aug 2003 10:00:55 -0700 (PDT)
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 3733816A4BF
	for <perforce@freebsd.org>; Fri, 22 Aug 2003 10:00:55 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D464A43FCB
	for <perforce@freebsd.org>; Fri, 22 Aug 2003 10:00:54 -0700 (PDT)
	(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7MH0s0U025127
	for <perforce@freebsd.org>; Fri, 22 Aug 2003 10:00:54 -0700 (PDT)
	(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7MH0sgh025124
	for perforce@freebsd.org; Fri, 22 Aug 2003 10:00:54 -0700 (PDT)
Date: Fri, 22 Aug 2003 10:00:54 -0700 (PDT)
Message-Id: <200308221700.h7MH0sgh025124@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 36681 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Fri, 22 Aug 2003 17:00:56 -0000

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

Change 36681 by cvance@cvance_osx_laptop on 2003/08/22 10:00:48

	Insert calls to the MAC framework to initialize/destroy cred labels

Affected files ...

.. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_prot.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_prot.c#2 (text+ko) ====

@@ -72,6 +72,7 @@
 #include <sys/timeb.h>
 #include <sys/times.h>
 #include <sys/malloc.h>
+#include <sys/mac.h>
 
 #include <sys/mount.h>
 #include <mach/message.h>
@@ -659,6 +660,9 @@
 	MALLOC_ZONE(cr, struct ucred *, sizeof(*cr), M_CRED, M_WAITOK);
 	bzero((caddr_t)cr, sizeof(*cr));
 	cr->cr_ref = 1;
+#ifdef MAC
+	mac_init_cred(cr);
+#endif
 	return (cr);
 }
 
@@ -674,8 +678,12 @@
 	if (cr == NOCRED || cr == FSCRED)
 		panic("crfree");
 #endif
-	if (--cr->cr_ref == 0)
+	if (--cr->cr_ref == 0) {
+#ifdef MAC
+		mac_destroy_cred(cr);
+#endif
 		FREE_ZONE((caddr_t)cr, sizeof *cr, M_CRED);
+	}
 }
 
 /*