PERFORCE change 75473 for review

[Robert Watson]

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

Change 75473 by rwatson at 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);
 }
 
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message