xnu-1504.9.17.tar.gz

[apple/xnu.git] / bsd / kern / posix_sem.c

diff --git a/bsd/kern/posix_sem.c b/bsd/kern/posix_sem.c
index 3905e52995f7f8e57ed396653b8508b03a99b887..a2cd627f1c6fd0114179f3f8270ce0b4f661274f 100644 (file)
--- a/bsd/kern/posix_sem.c
+++ b/bsd/kern/posix_sem.c
@@ -1,30 +1,36 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  *     Copyright (c) 1990, 1996-1998 Apple Computer, Inc.
  *     All Rights Reserved.
  */
 /*
  */
 /*
  *     Copyright (c) 1990, 1996-1998 Apple Computer, Inc.
  *     All Rights Reserved.
  */
 /*

- * posix_shm.c : Support for POSIX semaphore apis
+ * posix_shm.c : Support for POSIX semaphore APIs

  *
  *     File:   posix_sem.c
  *     Author: Ananthakrishna Ramesh
  *
  *     File:   posix_sem.c
  *     Author: Ananthakrishna Ramesh


@@ -34,16 +40,22 @@
  *     Created for MacOSX
  *
  */
  *     Created for MacOSX
  *
  */

+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */

 
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

-#include <sys/file.h>
+#include <sys/file_internal.h>

 #include <sys/filedesc.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
 #include <sys/stat.h>

-#include <sys/buf.h>
-#include <sys/proc.h>
+#include <sys/proc_internal.h>
+#include <sys/kauth.h>

 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>


@@ -51,15 +63,34 @@
 #include <sys/tty.h>
 #include <sys/malloc.h>
 #include <sys/semaphore.h>
 #include <sys/tty.h>
 #include <sys/malloc.h>
 #include <sys/semaphore.h>

+#include <sys/sysproto.h>
+#include <sys/proc_info.h>
+
+#if CONFIG_MACF
+#include <sys/vnode_internal.h>
+#include <security/mac_framework.h>
+#endif
+
+#include <security/audit/audit.h>
+

 #include <mach/mach_types.h>
 #include <mach/vm_prot.h>
 #include <mach/semaphore.h>
 #include <mach/sync_policy.h>
 #include <mach/mach_types.h>
 #include <mach/vm_prot.h>
 #include <mach/semaphore.h>
 #include <mach/sync_policy.h>

+#include <mach/task.h>
+#include <kern/kern_types.h>

 #include <kern/task.h>
 #include <kern/clock.h>
 #include <mach/kern_return.h>
 
 
 #include <kern/task.h>
 #include <kern/clock.h>
 #include <mach/kern_return.h>
 
 

+#define f_flag f_fglob->fg_flag
+#define f_type f_fglob->fg_type
+#define f_msgcount f_fglob->fg_msgcount
+#define f_cred f_fglob->fg_cred
+#define f_ops f_fglob->fg_ops
+#define f_offset f_fglob->fg_offset
+#define f_data f_fglob->fg_data

 #define        PSEMNAMLEN      31      /* maximum name segment length we bother with */
 
 struct pseminfo {
 #define        PSEMNAMLEN      31      /* maximum name segment length we bother with */
 
 struct pseminfo {


@@ -69,8 +100,9 @@ struct pseminfo {
        uid_t           psem_uid;
        gid_t           psem_gid;
        char            psem_name[PSEMNAMLEN + 1];      /* segment name */
        uid_t           psem_uid;
        gid_t           psem_gid;
        char            psem_name[PSEMNAMLEN + 1];      /* segment name */

-       void *          psem_semobject;
-       struct proc *   sem_proc;
+       semaphore_t     psem_semobject;
+       proc_t          sem_proc;
+       struct label *  psem_label;

 };
 #define PSEMINFO_NULL (struct pseminfo *)0
 
 };
 #define PSEMINFO_NULL (struct pseminfo *)0
 


@@ -103,7 +135,7 @@ struct      psemstats {
 struct psemname {
        char    *psem_nameptr;  /* pointer to looked up name */
        long    psem_namelen;   /* length of looked up component */
 struct psemname {
        char    *psem_nameptr;  /* pointer to looked up name */
        long    psem_namelen;   /* length of looked up component */

-       u_long  psem_hash;      /* hash value of looked up name */
+       u_int32_t       psem_hash;      /* hash value of looked up name */

 };
 
 struct psemnode {
 };
 
 struct psemnode {


@@ -121,22 +153,56 @@ struct psemnode {
 LIST_HEAD(psemhashhead, psemcache) *psemhashtbl;       /* Hash Table */
 u_long psemhash;                               /* size of hash table - 1 */
 long   psemnument;                     /* number of cache entries allocated */
 LIST_HEAD(psemhashhead, psemcache) *psemhashtbl;       /* Hash Table */
 u_long psemhash;                               /* size of hash table - 1 */
 long   psemnument;                     /* number of cache entries allocated */

+long   posix_sem_max = 10000;          /* tunable for max POSIX semaphores */
+                                       /* 10000 limits to ~1M of memory */
+SYSCTL_NODE(_kern, KERN_POSIX, posix, CTLFLAG_RW|CTLFLAG_LOCKED, 0, "Posix");
+SYSCTL_NODE(_kern_posix, OID_AUTO, sem, CTLFLAG_RW|CTLFLAG_LOCKED, 0, "Semaphores");
+SYSCTL_LONG (_kern_posix_sem, OID_AUTO, max, CTLFLAG_RW, &posix_sem_max, "max");
+

 struct psemstats psemstats;            /* cache effectiveness statistics */
 
 struct psemstats psemstats;            /* cache effectiveness statistics */
 

-int psem_cache_search __P((struct pseminfo **, struct psemname *, struct psemcache **));
+static int psem_access(struct pseminfo *pinfo, int mode, kauth_cred_t cred);
+static int psem_cache_search(struct pseminfo **,
+                               struct psemname *, struct psemcache **);
+static int psem_delete(struct pseminfo * pinfo);

 
 

-int psem_read  __P((struct file *fp, struct uio *uio,
-                                           struct ucred *cred));
-int psem_write  __P((struct file *fp, struct uio *uio,
-                                           struct ucred *cred));
-int psem_ioctl  __P((struct file *fp, u_long com,
-                                           caddr_t data, struct proc *p));
-int psem_select  __P((struct file *fp, int which,
-                                           struct proc *p));
-int psem_closefile  __P((struct file *fp, struct proc *p));
+static int psem_read (struct fileproc *fp, struct uio *uio,
+                           int flags, vfs_context_t ctx);
+static int psem_write (struct fileproc *fp, struct uio *uio,
+                           int flags, vfs_context_t ctx);
+static int psem_ioctl (struct fileproc *fp, u_long com,
+                           caddr_t data, vfs_context_t ctx);
+static int psem_select (struct fileproc *fp, int which, void *wql, vfs_context_t ctx);
+static int psem_closefile (struct fileglob *fp, vfs_context_t ctx);
+
+static int psem_kqfilter (struct fileproc *fp, struct knote *kn, vfs_context_t ctx);

 
 struct         fileops psemops =
 
 struct         fileops psemops =

-       { psem_read, psem_write, psem_ioctl, psem_select, psem_closefile };
+       { psem_read, psem_write, psem_ioctl, psem_select, psem_closefile, psem_kqfilter, NULL };
+
+
+static lck_grp_t       *psx_sem_subsys_lck_grp;
+static lck_grp_attr_t  *psx_sem_subsys_lck_grp_attr;
+static lck_attr_t      *psx_sem_subsys_lck_attr;
+static lck_mtx_t        psx_sem_subsys_mutex;
+
+#define PSEM_SUBSYS_LOCK() lck_mtx_lock(& psx_sem_subsys_mutex)
+#define PSEM_SUBSYS_UNLOCK() lck_mtx_unlock(& psx_sem_subsys_mutex)
+
+
+static int psem_cache_add(struct pseminfo *psemp, struct psemname *pnp, struct psemcache *pcp);
+/* Initialize the mutex governing access to the posix sem subsystem */
+__private_extern__ void
+psem_lock_init( void )
+{
+
+    psx_sem_subsys_lck_grp_attr = lck_grp_attr_alloc_init();
+
+    psx_sem_subsys_lck_grp = lck_grp_alloc_init("posix shared memory", psx_sem_subsys_lck_grp_attr);
+
+    psx_sem_subsys_lck_attr = lck_attr_alloc_init();
+    lck_mtx_init(& psx_sem_subsys_mutex, psx_sem_subsys_lck_grp, psx_sem_subsys_lck_attr);
+}

 
 /*
  * Lookup an entry in the cache 
 
 /*
  * Lookup an entry in the cache 


@@ -148,14 +214,12 @@ struct    fileops psemops =
  * fails, a status of zero is returned.
  */
 
  * fails, a status of zero is returned.
  */
 

-int
-psem_cache_search(psemp, pnp, pcache)
-       struct pseminfo **psemp;
-       struct psemname *pnp;
-       struct psemcache **pcache;
+static int
+psem_cache_search(struct pseminfo **psemp, struct psemname *pnp,
+                 struct psemcache **pcache)

 {
 {

-       register struct psemcache *pcp, *nnp;
-       register struct psemhashhead *pcpp;
+       struct psemcache *pcp, *nnp;
+       struct psemhashhead *pcpp;

 
        if (pnp->psem_namelen > PSEMNAMLEN) {
                psemstats.longnames++;
 
        if (pnp->psem_namelen > PSEMNAMLEN) {
                psemstats.longnames++;


@@ -195,35 +259,26 @@ psem_cache_search(psemp, pnp, pcache)
 /*
  * Add an entry to the cache.
  */
 /*
  * Add an entry to the cache.
  */

-int
-psem_cache_add(psemp, pnp)
-       struct pseminfo *psemp;
-       struct psemname *pnp;
+static int
+psem_cache_add(struct pseminfo *psemp, struct psemname *pnp, struct psemcache *pcp)

 {
 {

-       register struct psemcache *pcp;
-       register struct psemhashhead *pcpp;
+       struct psemhashhead *pcpp;

        struct pseminfo *dpinfo;
        struct psemcache *dpcp;
 
 #if DIAGNOSTIC
        struct pseminfo *dpinfo;
        struct psemcache *dpcp;
 
 #if DIAGNOSTIC

-       if (pnp->psem_namelen > NCHNAMLEN)
+       if (pnp->psem_namelen > PSEMNAMLEN)

                panic("cache_enter: name too long");
 #endif
 
                panic("cache_enter: name too long");
 #endif
 

-       /*
-        * We allocate a new entry if we are less than the maximum
-        * allowed and the one at the front of the LRU list is in use.
-        * Otherwise we use the one at the front of the LRU list.
-        */
-       pcp = (struct psemcache *)_MALLOC(sizeof(struct psemcache), M_SHM, M_WAITOK);
+

        /*  if the entry has already been added by some one else return */
        if (psem_cache_search(&dpinfo, pnp, &dpcp) == -1) {
        /*  if the entry has already been added by some one else return */
        if (psem_cache_search(&dpinfo, pnp, &dpcp) == -1) {

-               _FREE(pcp, M_SHM);

                return(EEXIST);
        }
                return(EEXIST);
        }

+       if (psemnument >= posix_sem_max)
+               return(ENOSPC);

        psemnument++;
        psemnument++;

-
-       bzero(pcp, sizeof(struct psemcache));

        /*
         * Fill in cache info, if vp is NULL this is a "negative" cache entry.
         * For negative entries, we have to record whether it is a whiteout.
        /*
         * Fill in cache info, if vp is NULL this is a "negative" cache entry.
         * For negative entries, we have to record whether it is a whiteout.


@@ -236,7 +291,7 @@ psem_cache_add(psemp, pnp)
        pcpp = PSEMHASH(pnp);
 #if DIAGNOSTIC
        {
        pcpp = PSEMHASH(pnp);
 #if DIAGNOSTIC
        {

-               register struct psemcache *p;
+               struct psemcache *p;

 
                for (p = pcpp->lh_first; p != 0; p = p->psem_hash.le_next)
                        if (p == pcp)
 
                for (p = pcpp->lh_first; p != 0; p = p->psem_hash.le_next)
                        if (p == pcp)


@@ -251,11 +306,26 @@ psem_cache_add(psemp, pnp)
  * Name cache initialization, from vfs_init() when we are booting
  */
 void
  * Name cache initialization, from vfs_init() when we are booting
  */
 void

-psem_cache_init()
+psem_cache_init(void)

 {
 {

-       psemhashtbl = hashinit(desiredvnodes, M_SHM, &psemhash);
+       psemhashtbl = hashinit(posix_sem_max / 2, M_SHM, &psemhash);

 }
 
 }
 

+static void
+psem_cache_delete(struct psemcache *pcp)
+{
+#if DIAGNOSTIC
+       if (pcp->psem_hash.le_prev == 0)
+               panic("psem namecache purge le_prev");
+       if (pcp->psem_hash.le_next == pcp)
+               panic("namecache purge le_next");
+#endif /* DIAGNOSTIC */
+       LIST_REMOVE(pcp, psem_hash);
+       pcp->psem_hash.le_prev = NULL;  
+       psemnument--;
+}
+
+#if NOT_USED

 /*
  * Invalidate a all entries to particular vnode.
  * 
 /*
  * Invalidate a all entries to particular vnode.
  * 


@@ -264,56 +334,31 @@ psem_cache_init()
  * need to ditch the entire cache, to avoid confusion. No valid vnode will
  * ever have (v_id == 0).
  */
  * need to ditch the entire cache, to avoid confusion. No valid vnode will
  * ever have (v_id == 0).
  */

-void
+static void

 psem_cache_purge(void)
 {
        struct psemcache *pcp;
        struct psemhashhead *pcpp;
 
        for (pcpp = &psemhashtbl[psemhash]; pcpp >= psemhashtbl; pcpp--) {
 psem_cache_purge(void)
 {
        struct psemcache *pcp;
        struct psemhashhead *pcpp;
 
        for (pcpp = &psemhashtbl[psemhash]; pcpp >= psemhashtbl; pcpp--) {

-               while (pcp = pcpp->lh_first)
+               while ( (pcp = pcpp->lh_first) )

                        psem_cache_delete(pcp);
        }
 }
                        psem_cache_delete(pcp);
        }
 }

-
-psem_cache_delete(pcp)
-       struct psemcache *pcp;
-{
-#if DIAGNOSTIC
-       if (pcp->psem_hash.le_prev == 0)
-               panic("psem namecache purge le_prev");
-       if (pcp->psem_hash.le_next == pcp)
-               panic("namecache purge le_next");
-#endif /* DIAGNOSTIC */
-       LIST_REMOVE(pcp, psem_hash);
-       pcp->psem_hash.le_prev = 0;     
-       psemnument--;
-}
-
-
-struct sem_open_args {
-const char *name;
-int oflag;
-int mode;
-int value;
-};
+#endif /* NOT_USED */

 
 int
 
 int

-sem_open(p, uap, retval)
-struct proc *p;
-register struct sem_open_args *uap;
-register_t *retval;
+sem_open(proc_t p, struct sem_open_args *uap, user_addr_t *retval)

 {
 {

-       register struct filedesc *fdp = p->p_fd;
-       register struct file *fp;
-       register struct vnode *vp;
-       int flags, i;
-       struct file *nfp;
-       int type, indx, error;
+       size_t i;
+       int indx, error;

        struct psemname nd;
        struct pseminfo *pinfo;
        struct psemname nd;
        struct pseminfo *pinfo;

-       extern struct fileops psemops;
-       char * pnbuf;
+       struct fileproc *fp = NULL;
+       char *pnbuf = NULL;
+       struct pseminfo *new_pinfo = PSEMINFO_NULL;
+       struct psemnode *new_pnode = PSEMNODE_NULL;
+       struct psemcache *pcache = PSEMCACHE_NULL;

        char * nameptr;
        char * cp;
        size_t pathlen, plen;
        char * nameptr;
        char * cp;
        size_t pathlen, plen;


@@ -321,27 +366,36 @@ register_t *retval;
        int cmode = uap->mode;
        int value = uap->value;
        int incache = 0;
        int cmode = uap->mode;
        int value = uap->value;
        int incache = 0;

-       struct psemnode * pnode = PSEMNODE_NULL;
-       struct psemcache * pcache = PSEMCACHE_NULL;
-       kern_return_t kret = KERN_SUCCESS;
-       int pinfo_alloc = 0;
+       struct psemcache *pcp = PSEMCACHE_NULL;
+       kern_return_t kret = KERN_INVALID_ADDRESS;      /* default fail */
+       
+       AUDIT_ARG(fflags, uap->oflag);
+       AUDIT_ARG(mode, uap->mode);
+       AUDIT_ARG(value32, uap->value);

 
        pinfo = PSEMINFO_NULL;
 
 
        pinfo = PSEMINFO_NULL;
 

-       MALLOC_ZONE(pnbuf, caddr_t,
-                       MAXPATHLEN, M_NAMEI, M_WAITOK);
+       /*
+        * Preallocate everything we might need up front to avoid taking
+        * and dropping the lock, opening us up to race conditions.
+        */
+       MALLOC_ZONE(pnbuf, caddr_t, MAXPATHLEN, M_NAMEI, M_WAITOK);
+       if (pnbuf == NULL) {
+               error = ENOSPC;
+               goto bad;
+       }
+

        pathlen = MAXPATHLEN;
        pathlen = MAXPATHLEN;

-       error = copyinstr(uap->name, pnbuf,
-               MAXPATHLEN, &pathlen);
+       error = copyinstr(uap->name, pnbuf, MAXPATHLEN, &pathlen);

        if (error) {
                goto bad;
        }
        if (error) {
                goto bad;
        }

-       if (pathlen > PSEMNAMLEN) {
+       AUDIT_ARG(text, pnbuf);
+       if ( (pathlen > PSEMNAMLEN) ) {

                error = ENAMETOOLONG;
                goto bad;
        }
 
                error = ENAMETOOLONG;
                goto bad;
        }
 

-

 #ifdef PSXSEM_NAME_RESTRICT
        nameptr = pnbuf;
        if (*nameptr == '/') {
 #ifdef PSXSEM_NAME_RESTRICT
        nameptr = pnbuf;
        if (*nameptr == '/') {


@@ -360,30 +414,92 @@ register_t *retval;
        nameptr = pnbuf;
        nd.psem_nameptr = nameptr;
        nd.psem_namelen = plen;
        nameptr = pnbuf;
        nd.psem_nameptr = nameptr;
        nd.psem_namelen = plen;

-       nd. psem_hash =0;
+       nd.psem_hash = 0;

 
         for (cp = nameptr, i=1; *cp != 0 && i <= plen; i++, cp++) {
                nd.psem_hash += (unsigned char)*cp * i;
        }
 
 
         for (cp = nameptr, i=1; *cp != 0 && i <= plen; i++, cp++) {
                nd.psem_hash += (unsigned char)*cp * i;
        }
 

+       /*
+        * attempt to allocate a new fp; if unsuccessful, the fp will be
+        * left unmodified (NULL).
+        */
+       error = falloc(p, &fp, &indx, vfs_context_current());
+       if (error)
+               goto bad;
+
+       /*
+        * We allocate a new entry if we are less than the maximum
+        * allowed and the one at the front of the LRU list is in use.
+        * Otherwise we use the one at the front of the LRU list.
+        */
+       MALLOC(pcp, struct psemcache *, sizeof(struct psemcache), M_SHM, M_WAITOK|M_ZERO);
+       if (pcp == PSEMCACHE_NULL) {
+               error = ENOMEM;
+               goto bad;
+       }
+
+       MALLOC(new_pinfo, struct pseminfo *, sizeof(struct pseminfo), M_SHM, M_WAITOK|M_ZERO);
+       if (new_pinfo == NULL) {
+               error = ENOSPC;
+               goto bad;
+       }
+#if CONFIG_MACF
+       mac_posixsem_label_init(new_pinfo);
+#endif
+
+       /*
+        * Provisionally create the semaphore in the new_pinfo; we have to do
+        * this here to prevent locking later.  We use the value of kret to
+        * signal success or failure, which is why we set its default value
+        * to KERN_INVALID_ADDRESS, above.
+        */
+       
+       fmode = FFLAGS(uap->oflag);
+       
+       if((fmode & O_CREAT)) {
+               
+               if((value < 0) || (value > SEM_VALUE_MAX)) {
+                       error = EINVAL;
+                       goto bad;
+               }
+               
+               kret = semaphore_create(kernel_task, &new_pinfo->psem_semobject, SYNC_POLICY_FIFO, value);
+       
+               if (kret != KERN_SUCCESS) {
+                       switch (kret) {
+                               case KERN_RESOURCE_SHORTAGE:
+                                       error = ENOMEM;
+                                       break;
+                               case KERN_PROTECTION_FAILURE:
+                                       error = EACCES;
+                                       break;
+                               default:
+                                       error = EINVAL;
+                       }
+                       goto bad;
+               }
+       }
+       
+       MALLOC(new_pnode, struct psemnode *, sizeof(struct psemnode), M_SHM, M_WAITOK|M_ZERO);
+       if (new_pnode == NULL) {
+               error = ENOSPC;
+               goto bad;
+       }
+
+       PSEM_SUBSYS_LOCK();

        error = psem_cache_search(&pinfo, &nd, &pcache);
 
        if (error == ENOENT) {
                error = EINVAL;
        error = psem_cache_search(&pinfo, &nd, &pcache);
 
        if (error == ENOENT) {
                error = EINVAL;

-               goto bad;
+               goto bad_locked;

 
        }
        if (!error) {
                incache = 0;
        } else
                incache = 1;
 
        }
        if (!error) {
                incache = 0;
        } else
                incache = 1;

-       fmode = FFLAGS(uap->oflag);
-
-       if (error = falloc(p, &nfp, &indx)) {
-               goto bad;
-       }

 
 

-       fp = nfp;

        cmode &=  ALLPERMS;
 
        if (((fmode & (O_CREAT | O_EXCL))==(O_CREAT | O_EXCL)) &&  incache) {
        cmode &=  ALLPERMS;
 
        if (((fmode & (O_CREAT | O_EXCL))==(O_CREAT | O_EXCL)) &&  incache) {


@@ -392,106 +508,152 @@ register_t *retval;
                if (pinfo->psem_flags & PSEM_INDELETE) {
                }
 #endif 
                if (pinfo->psem_flags & PSEM_INDELETE) {
                }
 #endif 

+               AUDIT_ARG(posix_ipc_perm, pinfo->psem_uid,
+                       pinfo->psem_gid, pinfo->psem_mode);

                error = EEXIST;
                error = EEXIST;

-               goto bad1;
+               goto bad_locked;

        }
        if (((fmode & (O_CREAT | O_EXCL))== O_CREAT) &&  incache) {
                /* As per POSIX, O_CREAT has no effect */
                fmode &= ~O_CREAT;
        }
 
        }
        if (((fmode & (O_CREAT | O_EXCL))== O_CREAT) &&  incache) {
                /* As per POSIX, O_CREAT has no effect */
                fmode &= ~O_CREAT;
        }
 

-       if (fmode & O_CREAT) {
-               if((value < 0) && (value > SEM_VALUE_MAX)) {
-                       error = EINVAL;
-                       goto bad1;
-               }
-               pinfo = (struct pseminfo *)_MALLOC(sizeof(struct pseminfo), M_SHM, M_WAITOK);
-               bzero(pinfo, sizeof(struct pseminfo));
-               pinfo_alloc = 1;
+       if ( (fmode & O_CREAT) ) {
+               /* create a new one (commit the allocation) */
+               pinfo = new_pinfo;

                pinfo->psem_flags = PSEM_DEFINED | PSEM_INCREATE;
                pinfo->psem_usecount = 1;
                pinfo->psem_mode = cmode;
                pinfo->psem_flags = PSEM_DEFINED | PSEM_INCREATE;
                pinfo->psem_usecount = 1;
                pinfo->psem_mode = cmode;

-               pinfo->psem_uid = p->p_ucred->cr_uid;
-               pinfo->psem_gid = p->p_ucred->cr_gid;
-               kret = semaphore_create(kernel_task, &pinfo->psem_semobject,
-                            SYNC_POLICY_FIFO, value);
-               if(kret != KERN_SUCCESS) 
-                       goto bad3;
+               pinfo->psem_uid = kauth_cred_getuid(kauth_cred_get());
+               pinfo->psem_gid = kauth_cred_get()->cr_gid;
+               bcopy(pnbuf, &pinfo->psem_name[0], PSEMNAMLEN);
+               pinfo->psem_name[PSEMNAMLEN]= 0;

                pinfo->psem_flags &= ~PSEM_DEFINED;
                pinfo->psem_flags |= PSEM_ALLOCATED;
                pinfo->sem_proc = p;
                pinfo->psem_flags &= ~PSEM_DEFINED;
                pinfo->psem_flags |= PSEM_ALLOCATED;
                pinfo->sem_proc = p;

+               
+#if CONFIG_MACF
+               error = mac_posixsem_check_create(kauth_cred_get(), nameptr);
+               if (error) {
+                       goto bad_locked;
+               }
+               mac_posixsem_label_associate(kauth_cred_get(), pinfo, nameptr);
+#endif

        } else {
                /* semaphore should exist as it is without  O_CREAT */
                if (!incache) {
                        error = ENOENT;
        } else {
                /* semaphore should exist as it is without  O_CREAT */
                if (!incache) {
                        error = ENOENT;

-                       goto bad1;
+                       goto bad_locked;

                }
                if( pinfo->psem_flags & PSEM_INDELETE) {
                        error = ENOENT;
                }
                if( pinfo->psem_flags & PSEM_INDELETE) {
                        error = ENOENT;

-                       goto bad1;
+                       goto bad_locked;

                }       
                }       

-               if (error = psem_access(pinfo, fmode, p->p_ucred, p))
-                       goto bad1;
+               AUDIT_ARG(posix_ipc_perm, pinfo->psem_uid,
+                       pinfo->psem_gid, pinfo->psem_mode);
+#if CONFIG_MACF
+               error = mac_posixsem_check_open(kauth_cred_get(), pinfo);
+               if (error) {
+                       goto bad_locked;
+               }
+#endif
+               if ( (error = psem_access(pinfo, fmode, kauth_cred_get())) ) {
+                       goto bad_locked;
+               }

        }
        }

-       pnode = (struct psemnode *)_MALLOC(sizeof(struct psemnode), M_SHM, M_WAITOK);
-       bzero(pnode, sizeof(struct psemnode));

 
        if (!incache) {
 
        if (!incache) {

-               if (error = psem_cache_add(pinfo, &nd)) {
-               goto bad2;
+               /* if successful, this will consume the pcp */
+               if ( (error = psem_cache_add(pinfo, &nd, pcp)) ) {
+                       goto bad_locked;

                }
        }
        pinfo->psem_flags &= ~PSEM_INCREATE;
        pinfo->psem_usecount++;
                }
        }
        pinfo->psem_flags &= ~PSEM_INCREATE;
        pinfo->psem_usecount++;

-       pnode->pinfo = pinfo;
-       fp->f_flag = flags & FMASK;
+       new_pnode->pinfo = pinfo;
+       PSEM_SUBSYS_UNLOCK();
+
+       /*
+        * if incache, we did not use the new pcp or the new pcp or the
+        * new . and we must free them.
+        */
+       if (incache) {
+               FREE(pcp, M_SHM);
+               pcp = PSEMCACHE_NULL;
+               if (new_pinfo != PSEMINFO_NULL) {
+                       /* return value ignored - we can't _not_ do this */
+                       (void)semaphore_destroy(kernel_task, new_pinfo->psem_semobject);
+#if CONFIG_MACF
+                       mac_posixsem_label_destroy(new_pinfo);
+#endif
+                       FREE(new_pinfo, M_SHM);
+                       new_pinfo = PSEMINFO_NULL;
+               }
+       }
+
+       proc_fdlock(p);
+       fp->f_flag = fmode & FMASK;

        fp->f_type = DTYPE_PSXSEM;
        fp->f_ops = &psemops;
        fp->f_type = DTYPE_PSXSEM;
        fp->f_ops = &psemops;

-       fp->f_data = (caddr_t)pnode;
-       *fdflags(p, indx) &= ~UF_RESERVED;
-       *retval = indx;
-       _FREE_ZONE(pnbuf, MAXPATHLEN, M_NAMEI);
+       fp->f_data = (caddr_t)new_pnode;
+       procfdtbl_releasefd(p, indx, NULL);
+       fp_drop(p, indx, fp, 1);
+       proc_fdunlock(p);
+
+       *retval = CAST_USER_ADDR_T(indx);
+       FREE_ZONE(pnbuf, MAXPATHLEN, M_NAMEI);

        return (0);
 
        return (0);
 

-bad3:
-       switch (kret) {
-       case KERN_RESOURCE_SHORTAGE:
-               error = ENOMEM;
-       case KERN_PROTECTION_FAILURE:
-               error = EACCES;
-       default:
-               error = EINVAL;
-       }
-       goto bad1;
-bad2:
-       _FREE(pnode, M_SHM);
-       if (pinfo_alloc)
-               _FREE(pinfo, M_SHM);
-bad1:
-       fdrelse(p, indx);
-       ffree(nfp);
+bad_locked:
+       PSEM_SUBSYS_UNLOCK();

 bad:
 bad:

-       _FREE_ZONE(pnbuf, MAXPATHLEN, M_NAMEI);
+       if (pcp != PSEMCACHE_NULL)
+               FREE(pcp, M_SHM);
+
+       if (new_pnode != PSEMNODE_NULL)
+               FREE(new_pnode, M_SHM);
+
+       if (fp != NULL)
+               fp_free(p, indx, fp);
+
+       if (new_pinfo != PSEMINFO_NULL) {
+               /*
+                * kret signals whether or not we successfully created a
+                * Mach semaphore for this semaphore; if so, we need to
+                * destroy it here.
+                */
+               if (kret == KERN_SUCCESS) {
+                       /* return value ignored - we can't _not_ do this */
+                       (void)semaphore_destroy(kernel_task, new_pinfo->psem_semobject);
+               }
+#if CONFIG_MACF
+               mac_posixsem_label_destroy(new_pinfo);
+#endif
+               FREE(new_pinfo, M_SHM);
+       }
+
+       if (pnbuf != NULL)
+               FREE_ZONE(pnbuf, MAXPATHLEN, M_NAMEI);

        return (error);
 }
 
        return (error);
 }
 

-
-
-int
-psem_access(struct pseminfo *pinfo, int mode, struct ucred *cred, struct proc *p)
+/*
+ * XXX This code is repeated in several places
+ */
+static int
+psem_access(struct pseminfo *pinfo, int mode, kauth_cred_t cred)

 {
        mode_t mask;
 {
        mode_t mask;

-       register gid_t *gp;
-       int i, error;
+       int is_member;

 
        /* Otherwise, user id 0 always gets access. */
 
        /* Otherwise, user id 0 always gets access. */

-       if (cred->cr_uid == 0)
+       if (!suser(cred, NULL))

                return (0);
 
        mask = 0;
 
        /* Otherwise, check the owner. */
                return (0);
 
        mask = 0;
 
        /* Otherwise, check the owner. */

-       if (cred->cr_uid == pinfo->psem_uid) {
+       if (kauth_cred_getuid(cred) == pinfo->psem_uid) {

                if (mode & FREAD)
                        mask |= S_IRUSR;
                if (mode & FWRITE)
                if (mode & FREAD)
                        mask |= S_IRUSR;
                if (mode & FWRITE)


@@ -500,14 +662,13 @@ psem_access(struct pseminfo *pinfo, int mode, struct ucred *cred, struct proc *p
        }
 
        /* Otherwise, check the groups. */
        }
 
        /* Otherwise, check the groups. */

-       for (i = 0, gp = cred->cr_groups; i < cred->cr_ngroups; i++, gp++)
-               if (pinfo->psem_gid == *gp) {
-                       if (mode & FREAD)
-                               mask |= S_IRGRP;
-                       if (mode & FWRITE)
-                               mask |= S_IWGRP;
-                       return ((pinfo->psem_mode & mask) == mask ? 0 : EACCES);
-               }
+       if (kauth_cred_ismember_gid(cred, pinfo->psem_gid, &is_member) == 0 && is_member) {
+               if (mode & FREAD)
+                       mask |= S_IRGRP;
+               if (mode & FWRITE)
+                       mask |= S_IWGRP;
+               return ((pinfo->psem_mode & mask) == mask ? 0 : EACCES);
+       }

 
        /* Otherwise, check everyone else. */
        if (mode & FREAD)
 
        /* Otherwise, check everyone else. */
        if (mode & FREAD)


@@ -517,46 +678,32 @@ psem_access(struct pseminfo *pinfo, int mode, struct ucred *cred, struct proc *p
        return ((pinfo->psem_mode & mask) == mask ? 0 : EACCES);
 }
 
        return ((pinfo->psem_mode & mask) == mask ? 0 : EACCES);
 }
 

-
-
-
-struct sem_unlink_args {
-const char *name;
-};
-

 int
 int

-sem_unlink(p, uap, retval)
-struct proc *p;
-register struct sem_unlink_args *uap;
-register_t *retval;
+sem_unlink(__unused proc_t p, struct sem_unlink_args *uap, __unused int32_t *retval)

 {
 {

-       register struct filedesc *fdp = p->p_fd;
-       register struct file *fp;
-       int flags, i;
+       size_t i;

        int error=0;
        struct psemname nd;
        struct pseminfo *pinfo;
        int error=0;
        struct psemname nd;
        struct pseminfo *pinfo;

-       extern struct fileops psemops;

        char * pnbuf;
        char * nameptr;
        char * cp;
        size_t pathlen, plen;
        char * pnbuf;
        char * nameptr;
        char * cp;
        size_t pathlen, plen;

-       int fmode, cmode ;

        int incache = 0;
        int incache = 0;

-       struct psemnode * pnode = PSEMNODE_NULL;

        struct psemcache *pcache = PSEMCACHE_NULL;
        struct psemcache *pcache = PSEMCACHE_NULL;

-       kern_return_t kret;

 
        pinfo = PSEMINFO_NULL;
 
 
        pinfo = PSEMINFO_NULL;
 

-       MALLOC_ZONE(pnbuf, caddr_t,
-                       MAXPATHLEN, M_NAMEI, M_WAITOK);
+       MALLOC_ZONE(pnbuf, caddr_t, MAXPATHLEN, M_NAMEI, M_WAITOK);
+       if (pnbuf == NULL) {
+               return(ENOSPC);         /* XXX non-standard */
+       }

        pathlen = MAXPATHLEN;
        pathlen = MAXPATHLEN;

-       error = copyinstr(uap->name, pnbuf,
-               MAXPATHLEN, &pathlen);
+       error = copyinstr(uap->name, pnbuf, MAXPATHLEN, &pathlen);

        if (error) {
                goto bad;
        }
        if (error) {
                goto bad;
        }

+       AUDIT_ARG(text, pnbuf);

        if (pathlen > PSEMNAMLEN) {
                error = ENAMETOOLONG;
                goto bad;
        if (pathlen > PSEMNAMLEN) {
                error = ENAMETOOLONG;
                goto bad;


@@ -587,153 +734,194 @@ register_t *retval;
                nd.psem_hash += (unsigned char)*cp * i;
        }
 
                nd.psem_hash += (unsigned char)*cp * i;
        }
 

+       PSEM_SUBSYS_LOCK();

        error = psem_cache_search(&pinfo, &nd, &pcache);
 
        if (error == ENOENT) {
        error = psem_cache_search(&pinfo, &nd, &pcache);
 
        if (error == ENOENT) {

+               PSEM_SUBSYS_UNLOCK();

                error = EINVAL;
                goto bad;
 
        }
        if (!error) {
                error = EINVAL;
                goto bad;
 
        }
        if (!error) {

+               PSEM_SUBSYS_UNLOCK();

                error = EINVAL;
                goto bad;
        } else
                incache = 1;
                error = EINVAL;
                goto bad;
        } else
                incache = 1;

-       if (error = psem_access(pinfo, pinfo->psem_mode, p->p_ucred, p))
+#if CONFIG_MACF
+       error = mac_posixsem_check_unlink(kauth_cred_get(), pinfo, nameptr);
+       if (error) {
+               PSEM_SUBSYS_UNLOCK();
+               goto bad;
+       }
+#endif
+       if ( (error = psem_access(pinfo, pinfo->psem_mode, kauth_cred_get())) ) {
+               PSEM_SUBSYS_UNLOCK();

                goto bad;
                goto bad;

+       }

 
        if ((pinfo->psem_flags & (PSEM_DEFINED | PSEM_ALLOCATED))==0) {
 
        if ((pinfo->psem_flags & (PSEM_DEFINED | PSEM_ALLOCATED))==0) {

-               return (EINVAL);
+               PSEM_SUBSYS_UNLOCK();
+               error = EINVAL;
+               goto bad;

        }
 
        }
 

-       if (pinfo->psem_flags & PSEM_INDELETE) {
+       if ( (pinfo->psem_flags & PSEM_INDELETE) ) {
+               PSEM_SUBSYS_UNLOCK();

                error = 0;
                goto bad;
        }
                error = 0;
                goto bad;
        }

+
+       AUDIT_ARG(posix_ipc_perm, pinfo->psem_uid, pinfo->psem_gid,
+                 pinfo->psem_mode);
+

        pinfo->psem_flags |= PSEM_INDELETE;
        pinfo->psem_usecount--;
 
        if (!pinfo->psem_usecount) {
                psem_delete(pinfo);
        pinfo->psem_flags |= PSEM_INDELETE;
        pinfo->psem_usecount--;
 
        if (!pinfo->psem_usecount) {
                psem_delete(pinfo);

-               _FREE(pinfo,M_SHM);
+               FREE(pinfo,M_SHM);

        } else
                pinfo->psem_flags |= PSEM_REMOVED;
 
        psem_cache_delete(pcache);
        } else
                pinfo->psem_flags |= PSEM_REMOVED;
 
        psem_cache_delete(pcache);

-       _FREE(pcache, M_SHM);
+       PSEM_SUBSYS_UNLOCK();
+       FREE(pcache, M_SHM);

        error = 0;
 bad:
        error = 0;
 bad:

-       _FREE_ZONE(pnbuf, MAXPATHLEN, M_NAMEI);
+       FREE_ZONE(pnbuf, MAXPATHLEN, M_NAMEI);

        return (error);
 }
 
        return (error);
 }
 

-struct sem_close_args {
-sem_t *sem;
-};
-

 int
 int

-sem_close(p, uap, retval)
-       struct proc *p;
-       struct sem_close_args *uap;
-       register_t *retval;
+sem_close(proc_t p, struct sem_close_args *uap, __unused int32_t *retval)

 {
 {

-       int fd = (int)uap->sem;
-       register struct filedesc *fdp = p->p_fd;
-       register struct file *fp;
+       int fd = CAST_DOWN_EXPLICIT(int,uap->sem);
+       struct fileproc *fp;

        int error = 0;
 
        int error = 0;
 

+       AUDIT_ARG(fd, fd); /* XXX This seems wrong; uap->sem is a pointer */

 
 

-       if ((u_int)fd >= fdp->fd_nfiles ||
-                       (fp = fdp->fd_ofiles[fd]) == NULL ||
-                       (fdp->fd_ofileflags[fd] & UF_RESERVED))
-               return (EBADF);
-       fdrelse(p, fd);
-       if( error = closef(fp, p))
+       proc_fdlock(p);
+       error = fp_lookup(p,fd, &fp, 1);
+       if (error) {
+               proc_fdunlock(p);

                return(error);
                return(error);

-       return(0);
-       
-       
+       }
+       fileproc_drain(p, fp);
+       fdrelse(p, fd);
+       error = closef_locked(fp, fp->f_fglob, p);
+       FREE_ZONE(fp, sizeof *fp, M_FILEPROC);
+       proc_fdunlock(p);
+       return(error);

 }
 
 }
 

-struct sem_wait_args {
-sem_t *sem;
-};
+int
+sem_wait(proc_t p, struct sem_wait_args *uap, int32_t *retval)
+{
+       __pthread_testcancel(1);
+       return(sem_wait_nocancel(p, (struct sem_wait_nocancel_args *)uap, retval));
+}

 
 int
 
 int

-sem_wait(p, uap, retval)
-       struct proc *p;
-       struct sem_wait_args *uap;
-       register_t *retval;
+sem_wait_nocancel(proc_t p, struct sem_wait_nocancel_args *uap, __unused int32_t *retval)

 {
 {

-       int fd = (int)uap->sem;
-       register struct filedesc *fdp = p->p_fd;
-       struct file *fp;
+       int fd = CAST_DOWN_EXPLICIT(int,uap->sem);
+       struct fileproc *fp;

        struct pseminfo * pinfo;
        struct psemnode * pnode ;
        kern_return_t kret;
        int error;
 
        struct pseminfo * pinfo;
        struct psemnode * pnode ;
        kern_return_t kret;
        int error;
 

-       if (error = fdgetf(p, (int)uap->sem, &fp))
+       error = fp_getfpsem(p, fd, &fp, &pnode);
+       if (error)

                return (error);
                return (error);

-       if (fp->f_type != DTYPE_PSXSEM)
-               return(EBADF);
-       if (((pnode = (struct psemnode *)fp->f_data)) == PSEMNODE_NULL )
-               return(EINVAL);
-       if ((pinfo = pnode->pinfo) == PSEMINFO_NULL)
-               return(EINVAL);
+       if (((pnode = (struct psemnode *)fp->f_data)) == PSEMNODE_NULL )  {
+               error = EINVAL;
+               goto out;
+       }
+       PSEM_SUBSYS_LOCK();
+       if ((pinfo = pnode->pinfo) == PSEMINFO_NULL) {
+               PSEM_SUBSYS_UNLOCK();
+               error = EINVAL;
+               goto out;
+       }

        if ((pinfo->psem_flags & (PSEM_DEFINED | PSEM_ALLOCATED)) 
                        != PSEM_ALLOCATED) {
        if ((pinfo->psem_flags & (PSEM_DEFINED | PSEM_ALLOCATED)) 
                        != PSEM_ALLOCATED) {

-               return(EINVAL);
+               PSEM_SUBSYS_UNLOCK();
+               error = EINVAL;
+               goto out;

        }
        }

-
+#if CONFIG_MACF
+       error = mac_posixsem_check_wait(kauth_cred_get(), pinfo);
+       if (error) {
+               PSEM_SUBSYS_UNLOCK();
+               goto out;
+       }
+#endif
+       PSEM_SUBSYS_UNLOCK();

        kret = semaphore_wait(pinfo->psem_semobject);
        switch (kret) {
        case KERN_INVALID_ADDRESS:
        case KERN_PROTECTION_FAILURE:
        kret = semaphore_wait(pinfo->psem_semobject);
        switch (kret) {
        case KERN_INVALID_ADDRESS:
        case KERN_PROTECTION_FAILURE:

-               return (EACCES);
+               error = EACCES;
+               break;

        case KERN_ABORTED:
        case KERN_OPERATION_TIMED_OUT:
        case KERN_ABORTED:
        case KERN_OPERATION_TIMED_OUT:

-               return (EINTR);
+               error = EINTR;
+               break;

        case KERN_SUCCESS:
        case KERN_SUCCESS:

-               return(0);
+               error = 0;
+               break;

        default:
        default:

-               return (EINVAL);
+               error = EINVAL;
+               break;

        }
        }

+out:
+       fp_drop(p, fd, fp, 0);
+       return(error);

 
 }
 
 
 }
 

-struct sem_trywait_args {
-sem_t *sem;
-};
-

 int
 int

-sem_trywait(p, uap, retval)
-       struct proc *p;
-       struct sem_wait_args *uap;
-       register_t *retval;
+sem_trywait(proc_t p, struct sem_trywait_args *uap, __unused int32_t *retval)

 {
 {

-       int fd = (int)uap->sem;
-       register struct filedesc *fdp = p->p_fd;
-       struct file *fp;
+       int fd = CAST_DOWN_EXPLICIT(int,uap->sem);
+       struct fileproc *fp;

        struct pseminfo * pinfo;
        struct psemnode * pnode ;
        kern_return_t kret;
        mach_timespec_t wait_time;
        int error;
        
        struct pseminfo * pinfo;
        struct psemnode * pnode ;
        kern_return_t kret;
        mach_timespec_t wait_time;
        int error;
        

-       if (error = fdgetf(p, (int)uap->sem, &fp))
+       error = fp_getfpsem(p, fd, &fp, &pnode);
+       if (error)

                return (error);
                return (error);

-       if (fp->f_type != DTYPE_PSXSEM)
-               return(EBADF);
-       if (((pnode = (struct psemnode *)fp->f_data)) == PSEMNODE_NULL )
-               return(EINVAL);
-       if ((pinfo = pnode->pinfo) == PSEMINFO_NULL)
-               return(EINVAL);
+       if (((pnode = (struct psemnode *)fp->f_data)) == PSEMNODE_NULL )  {
+               error = EINVAL;
+               goto out;
+       }
+       PSEM_SUBSYS_LOCK();
+       if ((pinfo = pnode->pinfo) == PSEMINFO_NULL) {
+               PSEM_SUBSYS_UNLOCK();
+               error = EINVAL;
+               goto out;
+       }

        if ((pinfo->psem_flags & (PSEM_DEFINED | PSEM_ALLOCATED)) 
                        != PSEM_ALLOCATED) {
        if ((pinfo->psem_flags & (PSEM_DEFINED | PSEM_ALLOCATED)) 
                        != PSEM_ALLOCATED) {

-               return(EINVAL);
+               PSEM_SUBSYS_UNLOCK();
+               error = EINVAL;
+               goto out;

        }
        }

-
+#if CONFIG_MACF
+       error = mac_posixsem_check_wait(kauth_cred_get(), pinfo);
+       if (error) {
+               PSEM_SUBSYS_UNLOCK();
+               goto out;
+       }
+#endif
+       PSEM_SUBSYS_UNLOCK();

        wait_time.tv_sec = 0;
        wait_time.tv_nsec = 0;
 
        wait_time.tv_sec = 0;
        wait_time.tv_nsec = 0;
 


@@ -741,134 +929,117 @@ sem_trywait(p, uap, retval)
        switch (kret) {
        case KERN_INVALID_ADDRESS:
        case KERN_PROTECTION_FAILURE:
        switch (kret) {
        case KERN_INVALID_ADDRESS:
        case KERN_PROTECTION_FAILURE:

-               return (EINVAL);
+               error = EINVAL;
+               break;

        case KERN_ABORTED:
        case KERN_ABORTED:

-               return (EINTR);
+               error = EINTR;
+               break;

        case KERN_OPERATION_TIMED_OUT:
        case KERN_OPERATION_TIMED_OUT:

-               return (EAGAIN);
+               error = EAGAIN;
+               break;

        case KERN_SUCCESS:
        case KERN_SUCCESS:

-               return(0);
+               error = 0;
+               break;

        default:
        default:

-               return (EINVAL);
+               error = EINVAL;
+               break;

        }
        }

-
+out:
+       fp_drop(p, fd, fp, 0);
+       return(error);

 }
 
 }
 

-struct sem_post_args {
-sem_t *sem;
-};
-

 int
 int

-sem_post(p, uap, retval)
-       struct proc *p;
-       struct sem_wait_args *uap;
-       register_t *retval;
+sem_post(proc_t p, struct sem_post_args *uap, __unused int32_t *retval)

 {
 {

-       int fd = (int)uap->sem;
-       register struct filedesc *fdp = p->p_fd;
-       struct file *fp;
+       int fd = CAST_DOWN_EXPLICIT(int,uap->sem);
+       struct fileproc *fp;

        struct pseminfo * pinfo;
        struct psemnode * pnode ;
        kern_return_t kret;
        int error;
 
        struct pseminfo * pinfo;
        struct psemnode * pnode ;
        kern_return_t kret;
        int error;
 

-       if (error = fdgetf(p, (int)uap->sem, &fp))
+       error = fp_getfpsem(p, fd, &fp, &pnode);
+       if (error)

                return (error);
                return (error);

-       if (fp->f_type != DTYPE_PSXSEM)
-               return(EBADF);
-       if (((pnode = (struct psemnode *)fp->f_data)) == PSEMNODE_NULL )
-               return(EINVAL);
-       if ((pinfo = pnode->pinfo) == PSEMINFO_NULL)
-               return(EINVAL);
+       if (((pnode = (struct psemnode *)fp->f_data)) == PSEMNODE_NULL )  {
+               error = EINVAL;
+               goto out;
+       }
+       PSEM_SUBSYS_LOCK();
+       if ((pinfo = pnode->pinfo) == PSEMINFO_NULL) {
+               PSEM_SUBSYS_UNLOCK();
+               error = EINVAL;
+               goto out;
+       }

        if ((pinfo->psem_flags & (PSEM_DEFINED | PSEM_ALLOCATED)) 
                        != PSEM_ALLOCATED) {
        if ((pinfo->psem_flags & (PSEM_DEFINED | PSEM_ALLOCATED)) 
                        != PSEM_ALLOCATED) {

-               return(EINVAL);
+               PSEM_SUBSYS_UNLOCK();
+               error = EINVAL;
+               goto out;

        }
        }

-
+#if CONFIG_MACF
+       error = mac_posixsem_check_post(kauth_cred_get(), pinfo);
+       if (error) {
+               PSEM_SUBSYS_UNLOCK();
+               goto out;
+       }
+#endif
+       PSEM_SUBSYS_UNLOCK();

        kret = semaphore_signal(pinfo->psem_semobject);
        switch (kret) {
        case KERN_INVALID_ADDRESS:
        case KERN_PROTECTION_FAILURE:
        kret = semaphore_signal(pinfo->psem_semobject);
        switch (kret) {
        case KERN_INVALID_ADDRESS:
        case KERN_PROTECTION_FAILURE:

-               return (EINVAL);
+               error = EINVAL;
+               break;

        case KERN_ABORTED:
        case KERN_OPERATION_TIMED_OUT:
        case KERN_ABORTED:
        case KERN_OPERATION_TIMED_OUT:

-               return (EINTR);
+               error = EINTR;
+               break;

        case KERN_SUCCESS:
        case KERN_SUCCESS:

-               return(0);
+               error = 0;
+               break;

        default:
        default:

-               return (EINVAL);
+               error = EINVAL;
+               break;

        }
        }

-
+out:
+       fp_drop(p, fd, fp, 0);
+       return(error);

 }
 
 }
 

-struct sem_init_args {
-sem_t *sem;
-int phsared;
-unsigned int value;
-};
-

 int
 int

-sem_init(p, uap, retval)
-       struct proc *p;
-       struct sem_init_args *uap;
-       register_t *retval;
+sem_init(__unused proc_t p, __unused struct sem_init_args *uap, __unused int32_t *retval)

 {
        return(ENOSYS);
 }
 
 {
        return(ENOSYS);
 }
 

-struct sem_destroy_args {
-sem_t *sem;
-};
-

 int
 int

-sem_destroy(p, uap, retval)
-       struct proc *p;
-       struct sem_destroy_args *uap;
-       register_t *retval;
+sem_destroy(__unused proc_t p, __unused struct sem_destroy_args *uap, __unused int32_t *retval)

 {
        return(ENOSYS);
 }
 
 {
        return(ENOSYS);
 }
 

-struct sem_getvalue_args {
-sem_t *sem;
-int * sval;
-};
-

 int
 int

-sem_getvalue(p, uap, retval)
-       struct proc *p;
-       struct sem_getvalue_args *uap;
-       register_t *retval;
+sem_getvalue(__unused proc_t p, __unused struct sem_getvalue_args *uap, __unused int32_t *retval)

 {
        return(ENOSYS);
 }
 
 {
        return(ENOSYS);
 }
 

-int
-psem_closefile(fp, p)
-       struct file *fp;
-       struct proc *p;
-{
-
-       return (psem_close(((struct psemnode *)fp->f_data), fp->f_flag,
-               fp->f_cred, p));
-}
-
-
-int
-psem_close(pnode, flags, cred, p)
-       register struct psemnode *pnode;
-       int flags;
-       struct ucred *cred;
-       struct proc *p;
+static int
+psem_close(struct psemnode *pnode, __unused int flags)

 {
        int error=0;
 {
        int error=0;

-       kern_return_t kret;
-       register struct pseminfo *pinfo;
+       struct pseminfo *pinfo;

 
 

-       if ((pinfo = pnode->pinfo) == PSEMINFO_NULL)
+       PSEM_SUBSYS_LOCK();
+       if ((pinfo = pnode->pinfo) == PSEMINFO_NULL){
+               PSEM_SUBSYS_UNLOCK();

                return(EINVAL);
                return(EINVAL);

+       }

 
        if ((pinfo->psem_flags & PSEM_ALLOCATED) != PSEM_ALLOCATED) {
 
        if ((pinfo->psem_flags & PSEM_ALLOCATED) != PSEM_ALLOCATED) {

+               PSEM_SUBSYS_UNLOCK();

                return(EINVAL);
        }
 #if DIAGNOSTIC
                return(EINVAL);
        }
 #if DIAGNOSTIC


@@ -879,19 +1050,41 @@ psem_close(pnode, flags, cred, p)
        pinfo->psem_usecount--;
 
        if ((pinfo->psem_flags & PSEM_REMOVED) && !pinfo->psem_usecount) {
        pinfo->psem_usecount--;
 
        if ((pinfo->psem_flags & PSEM_REMOVED) && !pinfo->psem_usecount) {

+               PSEM_SUBSYS_UNLOCK();
+               /* lock dropped as only semaphore is destroyed here */

                error = psem_delete(pinfo);
                error = psem_delete(pinfo);

-               _FREE(pinfo,M_SHM);
+               FREE(pinfo,M_SHM);
+       } else {
+               PSEM_SUBSYS_UNLOCK();

        }
        }

-       _FREE(pnode, M_SHM);
+       /* subsystem lock is dropped when we get here */
+       FREE(pnode, M_SHM);

        return (error);
 }
 
        return (error);
 }
 

-int 
+static int
+psem_closefile(struct fileglob *fg, __unused vfs_context_t ctx)
+{
+       int error;
+
+       /*
+        * Not locked as psem_close is called only from here and is locked
+        * properly
+        */
+       error =  psem_close(((struct psemnode *)fg->fg_data), fg->fg_flag);
+
+       return(error);
+}
+
+static int 

 psem_delete(struct pseminfo * pinfo)
 {
        kern_return_t kret;
 
        kret = semaphore_destroy(kernel_task, pinfo->psem_semobject);
 psem_delete(struct pseminfo * pinfo)
 {
        kern_return_t kret;
 
        kret = semaphore_destroy(kernel_task, pinfo->psem_semobject);

+#if CONFIG_MACF
+       mac_posixsem_label_destroy(pinfo);
+#endif

 
        switch (kret) {
        case KERN_INVALID_ADDRESS:
 
        switch (kret) {
        case KERN_INVALID_ADDRESS:


@@ -905,27 +1098,92 @@ psem_delete(struct pseminfo * pinfo)
        default:
                return (EINVAL);
        }
        default:
                return (EINVAL);
        }

-       

 }
 
 }
 

+static int
+psem_read(__unused struct fileproc *fp, __unused struct uio *uio, 
+                 __unused int flags, __unused vfs_context_t ctx)
+{
+       return(ENOTSUP);
+}

 
 

-int
-psem_read(struct file *fp, struct uio *uio, struct ucred *cred) 
+static int
+psem_write(__unused struct fileproc *fp, __unused struct uio *uio, 
+                  __unused int flags, __unused vfs_context_t ctx)

 {
 {

-       return(EOPNOTSUPP);
+       return(ENOTSUP);

 }
 }

-int
-psem_write(struct file *fp, struct uio *uio, struct ucred *cred)
+
+static int
+psem_ioctl(__unused struct fileproc *fp, __unused u_long com, 
+                       __unused caddr_t data, __unused vfs_context_t ctx)

 {
 {

-       return(EOPNOTSUPP);
+       return(ENOTSUP);

 }
 }

-int
-psem_ioctl(struct file *fp, u_long com, caddr_t data, struct proc *p)
+
+static int
+psem_select(__unused struct fileproc *fp, __unused int which, 
+                       __unused void *wql, __unused vfs_context_t ctx)

 {
 {

-       return(EOPNOTSUPP);
+       return(ENOTSUP);

 }
 }

+
+static int
+psem_kqfilter(__unused struct fileproc *fp, __unused struct knote *kn, 
+                               __unused vfs_context_t ctx)
+{
+       return (ENOTSUP);
+}
+

 int
 int

-psem_select(struct file *fp, int which, struct proc *p)
+fill_pseminfo(struct psemnode *pnode, struct psem_info * info)
+{
+       struct pseminfo *pinfo;
+       struct vinfo_stat  *sb;
+
+       PSEM_SUBSYS_LOCK();
+       if ((pinfo = pnode->pinfo) == PSEMINFO_NULL){
+               PSEM_SUBSYS_UNLOCK();
+               return(EINVAL);
+       }
+
+#if 0
+       if ((pinfo->psem_flags & PSEM_ALLOCATED) != PSEM_ALLOCATED) {
+               PSEM_SUBSYS_UNLOCK();
+               return(EINVAL);
+       }
+#endif
+
+       sb = &info->psem_stat;
+       bzero(sb, sizeof(struct vinfo_stat));
+
+       sb->vst_mode = pinfo->psem_mode;
+       sb->vst_uid = pinfo->psem_uid;
+       sb->vst_gid = pinfo->psem_gid;
+       sb->vst_size = pinfo->psem_usecount;
+       bcopy(&pinfo->psem_name[0], &info->psem_name[0], PSEMNAMLEN+1);
+
+       PSEM_SUBSYS_UNLOCK();
+       return(0);
+}
+
+#if CONFIG_MACF
+void
+psem_label_associate(struct fileproc *fp, struct vnode *vp, vfs_context_t ctx)

 {
 {

-       return(EOPNOTSUPP);
+       struct psemnode *pnode;
+       struct pseminfo *psem;
+
+       PSEM_SUBSYS_LOCK();
+       pnode = (struct psemnode *)fp->f_fglob->fg_data;
+       if (pnode != NULL) {
+               psem = pnode->pinfo;
+               if (psem != NULL)
+                       mac_posixsem_vnode_label_associate(
+                               vfs_context_ucred(ctx), psem, psem->psem_label,
+                               vp, vp->v_label);
+       }
+       PSEM_SUBSYS_UNLOCK();

 }
 }

+#endif
+