From owner-p4-projects@FreeBSD.ORG  Mon Nov 10 14:29:01 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1112B16A4F6; Mon, 10 Nov 2003 14:29:01 -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 D993916A4F4
	for <perforce@freebsd.org>; Mon, 10 Nov 2003 14:29:00 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4EB8743F85
	for <perforce@freebsd.org>; Mon, 10 Nov 2003 14:29:00 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAAMT0XJ066428
	for <perforce@freebsd.org>; Mon, 10 Nov 2003 14:29:00 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAAMSxKc066425
	for perforce@freebsd.org; Mon, 10 Nov 2003 14:28:59 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 10 Nov 2003 14:28:59 -0800 (PST)
Message-Id: <200311102228.hAAMSxKc066425@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 41938 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: Mon, 10 Nov 2003 22:29:01 -0000

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

Change 41938 by rwatson@rwatson_tislabs on 2003/11/10 14:27:59

	Integrate mac_labelzone_free() calls from trustedbsd_mac.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_net.c#5 integrate

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_net.c#5 (text+ko) ====

@@ -281,6 +281,7 @@
 {
 
 	MAC_PERFORM(destroy_bpfdesc_label, label);
+	mac_labelzone_free(label);
 	MAC_DEBUG_COUNTER_DEC(&nmacbpfdescs);
 }
 
@@ -297,6 +298,7 @@
 {
 
 	MAC_PERFORM(destroy_ifnet_label, label);
+	mac_labelzone_free(label);
 	MAC_DEBUG_COUNTER_DEC(&nmacifnets);
 }
 
@@ -313,6 +315,7 @@
 {
 
 	MAC_PERFORM(destroy_ipq_label, label);
+	mac_labelzone_free(label);
 	MAC_DEBUG_COUNTER_DEC(&nmacipqs);
 }
 
@@ -321,6 +324,7 @@
 {
 
 	mac_ipq_label_free(ipq->ipq_label);
+	ipq->ipq_label = NULL;
 }
 
 void
@@ -340,6 +344,7 @@
 {
 
 	MAC_PERFORM(destroy_socket_label, label);
+	mac_labelzone_free(label);
 	MAC_DEBUG_COUNTER_DEC(&nmacsockets);
 }
 
@@ -348,6 +353,7 @@
 {
 
 	MAC_PERFORM(destroy_socket_peer_label, label);
+	mac_labelzone_free(label);
 	MAC_DEBUG_COUNTER_DEC(&nmacsockets);
 }