From owner-p4-projects@FreeBSD.ORG  Wed Aug 30 21:29:14 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 A675E16A4E1; Wed, 30 Aug 2006 21:29:14 +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 7DA5016A4DA
	for <perforce@freebsd.org>; Wed, 30 Aug 2006 21:29:14 +0000 (UTC)
	(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 4A96D43D46
	for <perforce@freebsd.org>; Wed, 30 Aug 2006 21:29:14 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7ULTEHL038171
	for <perforce@freebsd.org>; Wed, 30 Aug 2006 21:29:14 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7ULTEqD038168
	for perforce@freebsd.org; Wed, 30 Aug 2006 21:29:14 GMT
	(envelope-from millert@freebsd.org)
Date: Wed, 30 Aug 2006 21:29:14 GMT
Message-Id: <200608302129.k7ULTEqD038168@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 105370 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: Wed, 30 Aug 2006 21:29:14 -0000

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

Change 105370 by millert@millert_g4tower on 2006/08/30 21:28:38

	Fix port label memory leak introduced by @4676.  Now that
	the port label is initialized in ipc_object_alloc() we don't
	need to do it (again) in ipc_port_init().  We *do*, however,
	need to init the port label in ipc_port_alloc_special(),
	since that doesn't go through the normal ipc_object_alloc()
	code path (kernel ports are special).

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_port.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_port.c#3 (text+ko) ====

@@ -471,10 +471,6 @@
 #endif	/* MACH_ASSERT */
 
 	ipc_mqueue_init(&port->ip_messages, FALSE /* set */);
-
-#ifdef MAC
-	mac_port_init_label (&port->ip_label);
-#endif
 }
 
 /*
@@ -1153,7 +1149,7 @@
 	 * we will use a new entry point for this purpose, as current_task()
 	 * is often wrong (i.e. not kernel_task) or null.
 	 */
-
+	mac_port_init_label(&port->ip_label);
 	mac_port_create_kernel(&port->ip_label, space == ipc_space_reply);
 #endif