Date: Mon, 18 Apr 2005 11:42:37 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 75473 for review Message-ID: <200504181142.j3IBgbs7085113@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200504181142.j3IBgbs7085113>