From owner-trustedbsd-cvs@FreeBSD.ORG  Tue Mar  7 17:06:03 2006
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
X-Original-To: trustedbsd-cvs@freebsd.org
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6E39B16A420
	for <trustedbsd-cvs@freebsd.org>; Tue,  7 Mar 2006 17:06:03 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CF23343D6B
	for <trustedbsd-cvs@freebsd.org>; Tue,  7 Mar 2006 17:05:48 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119])
	by cyrus.watson.org (Postfix) with ESMTP id 5F3DD46B8D
	for <trustedbsd-cvs@trustedbsd.org>;
	Tue,  7 Mar 2006 12:05:27 -0500 (EST)
Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18])
	by mx2.freebsd.org (Postfix) with ESMTP id EC25392498;
	Tue,  7 Mar 2006 17:05:32 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D69C316A423; Tue,  7 Mar 2006 17:05:32 +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 AC05116A420
	for <perforce@freebsd.org>; Tue,  7 Mar 2006 17:05:32 +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 F32BB43D55
	for <perforce@freebsd.org>; Tue,  7 Mar 2006 17:05:31 +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 k27H5VMn014694
	for <perforce@freebsd.org>; Tue, 7 Mar 2006 17:05:31 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27H5V54014691
	for perforce@freebsd.org; Tue, 7 Mar 2006 17:05:31 GMT
	(envelope-from millert@freebsd.org)
Date: Tue, 7 Mar 2006 17:05:31 GMT
Message-Id: <200603071705.k27H5V54014691@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 92925 for review
X-BeenThere: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: TrustedBSD CVS and Perforce commit message list
	<trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>, 
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Mar 2006 17:06:03 -0000

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

Change 92925 by millert@millert_ibook on 2006/03/07 17:05:30

	Check for null space in mach_get_task_label_text() too.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#8 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#8 (text+ko) ====

@@ -58,15 +58,15 @@
   
 	return (KERN_SUCCESS);
 }
+
 kern_return_t
-
 mach_get_task_label_text(
 	ipc_space_t	space,
 	labelstr_t	policies,
 	labelstr_t	outl)
 {
 
-	if (space == IS_NULL)
+	if (space == IS_NULL || space->is_task == NULL)
 		return KERN_INVALID_TASK;
 
 	tasklabel_lock(space->is_task);