From owner-p4-projects@FreeBSD.ORG  Sat Apr 16 11:02:28 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AAB9116A4D1; Sat, 16 Apr 2005 11:02:27 +0000 (GMT)
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 84A8616A4CF
	for <perforce@freebsd.org>; Sat, 16 Apr 2005 11:02:27 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6A04E43D58
	for <perforce@freebsd.org>; Sat, 16 Apr 2005 11:02:27 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3GB2Reu057393
	for <perforce@freebsd.org>; Sat, 16 Apr 2005 11:02:27 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3GB2RH6057390
	for perforce@freebsd.org; Sat, 16 Apr 2005 11:02:27 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 16 Apr 2005 11:02:27 GMT
Message-Id: <200504161102.j3GB2RH6057390@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 75313 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: Sat, 16 Apr 2005 11:02:28 -0000

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

Change 75313 by rwatson@rwatson_paprika on 2005/04/16 11:01:50

	Only allocate storage for a new rule if we're not deleting an existing
	rule.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#89 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#89 (text+ko) ====

@@ -154,7 +154,7 @@
 		return (ENOENT);
 
 	ruleptr = NULL;
-	if (req->newptr) {
+	if (req->newptr && req->newlen != 0) {
 		error = SYSCTL_IN(req, &temprule, sizeof(temprule));
 		if (error)
 			return (error);
@@ -178,7 +178,7 @@
 
 	if (req->newptr && req->newlen == 0) {
 		/* printf("deletion\n"); */
-		FREE(ruleptr, M_MACBSDEXTENDED);
+		KASSERT(ruleptr == NULL, ("sysctl_rule: ruleptr != NULL"));
 		ruleptr = rules[index];
 		if (ruleptr == NULL) {
 			error = ENOENT;