From owner-p4-projects@FreeBSD.ORG  Mon Apr 18 11:42:38 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 505FB16A4D0; Mon, 18 Apr 2005 11:42:38 +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 108F116A4CE
	for <perforce@freebsd.org>; Mon, 18 Apr 2005 11:42:38 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ED45743D4C
	for <perforce@freebsd.org>; Mon, 18 Apr 2005 11:42:37 +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 j3IBgbkg085116
	for <perforce@freebsd.org>; Mon, 18 Apr 2005 11:42:37 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 j3IBgbs7085113
	for perforce@freebsd.org; Mon, 18 Apr 2005 11:42:37 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 18 Apr 2005 11:42:37 GMT
Message-Id: <200504181142.j3IBgbs7085113@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 75473 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, 18 Apr 2005 11:42:39 -0000

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

Change 75473 by rwatson@rwatson_paprika on 2005/04/18 11:42:09

	Clean up local mis-merges from loop-back of SysV Sem labeling and
	access control.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#35 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#35 (text+ko) ====

@@ -623,6 +623,7 @@
 	}
 	mtx_unlock(sema_mtxp);
 #endif
+
 	error = 0;
 	rval = 0;
 
@@ -986,7 +987,7 @@
 	semid = IPCID_TO_IX(semid);	/* Convert back to zero origin */
 
 	if (semid < 0 || semid >= seminfo.semmni)
-		error = EINVAL;
+		return (EINVAL);
 
 	/* Allocate memory for sem_ops */
 	if (nsops <= SMALL_SOPS)
@@ -1245,7 +1246,6 @@
 	mtx_unlock(sema_mtxp);
 	if (sops != small_sops)
 		free(sops, M_SEM);
-	free(sops, M_SEM);
 	return (error);
 }