From owner-p4-projects@FreeBSD.ORG  Mon Dec 11 22:03:21 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 26EE816A66C; Mon, 11 Dec 2006 22:03:21 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E02B716A594
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 22:03:20 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C559C43D82
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 21:41:21 +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 kBBLgSAb097145
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 21:42:28 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLgS0s097136
	for perforce@freebsd.org; Mon, 11 Dec 2006 21:42:28 GMT
	(envelope-from millert@freebsd.org)
Date: Mon, 11 Dec 2006 21:42:28 GMT
Message-Id: <200612112142.kBBLgS0s097136@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 111488 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, 11 Dec 2006 22:03:21 -0000

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

Change 111488 by millert@millert_g5tower on 2006/12/11 21:41:42

	Free the right amount of memory when we have to expand
	the policy array.  Also fix some whitespace.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#29 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#29 (text+ko) ====

@@ -781,19 +781,22 @@
 
 	if (mac_policy_list.numloaded >= mac_policy_list.max) {
 		/* allocate new policy list array, zero new chunk */
-		tmac_policy_list_element = kalloc((sizeof(struct mac_policy_list_element) *
+		tmac_policy_list_element =
+		    kalloc((sizeof(struct mac_policy_list_element) *
 		    MAC_POLICY_LIST_CHUNKSIZE) * (mac_policy_list.chunks + 1));
 		bzero(&tmac_policy_list_element[mac_policy_list.max],
-		    sizeof(struct mac_policy_list_element) * MAC_POLICY_LIST_CHUNKSIZE);
+		    sizeof(struct mac_policy_list_element) *
+		    MAC_POLICY_LIST_CHUNKSIZE);
 		
 		/* copy old entries into new list */
 		memcpy(tmac_policy_list_element, mac_policy_list.entries, 
-		   sizeof(struct mac_policy_list_element) * MAC_POLICY_LIST_CHUNKSIZE *
-		   mac_policy_list.chunks);
+		   sizeof(struct mac_policy_list_element) *
+		   MAC_POLICY_LIST_CHUNKSIZE * mac_policy_list.chunks);
 	
 		/* free old array */
 		kfree(mac_policy_list.entries,
-		    sizeof(mac_policy_list_t) * mac_policy_busy);
+		    sizeof(struct mac_policy_list_element) *
+		    MAC_POLICY_LIST_CHUNKSIZE * mac_policy_list.chunks);
 		
 		mac_policy_list.entries = tmac_policy_list_element;