From owner-p4-projects@FreeBSD.ORG  Tue Dec  2 11:31:39 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 83A9C16A4D2; Tue,  2 Dec 2003 11:31:39 -0800 (PST)
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 4D01F16A4CF
	for <perforce@freebsd.org>; Tue,  2 Dec 2003 11:31:39 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 234FD44005
	for <perforce@freebsd.org>; Tue,  2 Dec 2003 11:31:29 -0800 (PST)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB2JVSXJ063001
	for <perforce@freebsd.org>; Tue, 2 Dec 2003 11:31:28 -0800 (PST)
	(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB2JVS0B062998
	for perforce@freebsd.org; Tue, 2 Dec 2003 11:31:28 -0800 (PST)
	(envelope-from areisse@nailabs.com)
Date: Tue, 2 Dec 2003 11:31:28 -0800 (PST)
Message-Id: <200312021931.hB2JVS0B062998@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 43312 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: Tue, 02 Dec 2003 19:31:39 -0000

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

Change 43312 by areisse@areisse_ibook on 2003/12/02 11:31:28

	don't use sebsd_ss_malloc, use kmalloc instead.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/ss/services.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/ss/services.c#4 (text+ko) ====

@@ -1379,9 +1379,9 @@
 		      if (p->numsids == p->maxsids)
 			{
 			  p->maxsids += 16;
-			  security_id_t *sids = sebsd_ss_malloc (sizeof (security_id_t) * p->maxsids, 0);
+			  security_id_t *sids = kmalloc (sizeof (security_id_t) * p->maxsids, GFP_KERNEL);
 			  memcpy (sids, p->sids, sizeof (security_id_t) * p->numsids);
-			  sebsd_ss_free (p->sids);
+			  kfree (p->sids);
 			  p->sids = sids;
 			}
 		      p->sids[p->numsids++] = sid;
@@ -1410,7 +1410,7 @@
     goto out_err;
   p.sca = policydb.class_val_to_struct[sclass - 1];
   p.maxsids = 32;
-  p.sids = sebsd_ss_malloc (sizeof (security_id_t) * p.maxsids, 0);
+  p.sids = kmalloc (sizeof (security_id_t) * p.maxsids, GFP_KERNEL);
   p.numsids = 0;
   avtab_map (&policydb.te_avtab, getfilesids1, &p);
   *sids = p.sids;