From owner-trustedbsd-cvs@FreeBSD.ORG  Mon Jan 22 16:04:03 2007
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 [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 72A6716A406
	for <trustedbsd-cvs@freebsd.org>; Mon, 22 Jan 2007 16:04:03 +0000 (UTC)
	(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 84C7C13C4BF
	for <trustedbsd-cvs@freebsd.org>; Mon, 22 Jan 2007 16:04:01 +0000 (UTC)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53])
	by cyrus.watson.org (Postfix) with ESMTP id 696C249565
	for <trustedbsd-cvs@trustedbsd.org>;
	Mon, 22 Jan 2007 11:03:52 -0500 (EST)
Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54])
	by mx2.freebsd.org (Postfix) with ESMTP id CB776561D9;
	Mon, 22 Jan 2007 16:03:50 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C2DB316A405; Mon, 22 Jan 2007 16:03:50 +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 809E116A403
	for <perforce@freebsd.org>; Mon, 22 Jan 2007 16:03:50 +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 6EB1213C45E
	for <perforce@freebsd.org>; Mon, 22 Jan 2007 16:03:50 +0000 (UTC)
	(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 l0MG3hF1027066
	for <perforce@freebsd.org>; Mon, 22 Jan 2007 16:03:43 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MG3hee027061
	for perforce@freebsd.org; Mon, 22 Jan 2007 16:03:43 GMT
	(envelope-from millert@freebsd.org)
Date: Mon, 22 Jan 2007 16:03:43 GMT
Message-Id: <200701221603.l0MG3hee027061@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 113344 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: Mon, 22 Jan 2007 16:04:03 -0000

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

Change 113344 by millert@millert_macbook on 2007/01/22 16:02:51

	sebsd_label_destroy() may be passed a NULL pointer if one
	of the per-policy label init routines fails.  In this case
	the framework has to clean up an allocations that did succeed
	but it is not smart enough to only clean up the ones up
	until the point of failure.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#69 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#69 (text+ko) ====

@@ -550,7 +550,8 @@
 sebsd_label_destroy(struct label *label)
 {
 
-	mac_zfree(sebsd_label_zone, SLOT(label));
+	if (SLOT(label)  != NULL)
+		mac_zfree(sebsd_label_zone, SLOT(label));
 	SLOT(label) = NULL;
 }