xnu-6153.141.1.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 1dcc200d2afceaa8797c98e80888d69197372cd1..b1119d15381f0860b6e3dea3c44e2a56d45ee342 100644 (file)
--- a/bsd/kern/posix_sem.c
+++ b/bsd/kern/posix_sem.c
@@ -1,8 +1,8 @@
 /*
 /*

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

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * 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
  * 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


@@ -11,10 +11,10 @@
  * 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.
  * 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.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 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,
  * 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,


@@ -22,7 +22,7 @@
  * 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.
  * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*


@@ -30,7 +30,7 @@
  *     All Rights Reserved.
  */
 /*
  *     All Rights Reserved.
  */
 /*

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

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


@@ -40,6 +40,12 @@
  *     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/cdefs.h>
 #include <sys/param.h>


@@ -58,8 +64,14 @@
 #include <sys/malloc.h>
 #include <sys/semaphore.h>
 #include <sys/sysproto.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 <bsm/audit_kernel.h>
+#include <security/audit/audit.h>

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


@@ -71,61 +83,64 @@
 #include <kern/clock.h>
 #include <mach/kern_return.h>
 
 #include <kern/clock.h>
 #include <mach/kern_return.h>
 

-#if KTRACE
-#include <sys/ktrace.h>
-#endif

 
 #define f_flag f_fglob->fg_flag
 
 #define f_flag f_fglob->fg_flag

-#define f_type f_fglob->fg_type
+#define f_type f_fglob->fg_ops->fo_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 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 */
+#define PSEMNAMLEN      31      /* maximum name segment length we bother with */

 
 struct pseminfo {
 
 struct pseminfo {

-       unsigned int    psem_flags;
-       unsigned int    psem_usecount;
-       mode_t          psem_mode;
-       uid_t           psem_uid;
-       gid_t           psem_gid;
-       char            psem_name[PSEMNAMLEN + 1];      /* segment name */
-       semaphore_t     psem_semobject;
-       struct proc *   sem_proc;
+       unsigned int    psem_flags;
+       unsigned int    psem_usecount;
+       mode_t          psem_mode;
+       uid_t           psem_uid;
+       gid_t           psem_gid;
+       char            psem_name[PSEMNAMLEN + 1];      /* segment name */
+       semaphore_t     psem_semobject;
+       struct label *  psem_label;
+       pid_t           psem_creator_pid;
+       uint64_t        psem_creator_uniqueid;

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

-#define        PSEM_NONE       1
-#define        PSEM_DEFINED    2
-#define        PSEM_ALLOCATED  4
-#define        PSEM_MAPPED     8
-#define        PSEM_INUSE      0x10
-#define        PSEM_REMOVED    0x20
-#define        PSEM_INCREATE   0x40
-#define        PSEM_INDELETE   0x80
-
-struct psemcache {
-       LIST_ENTRY(psemcache) psem_hash;        /* hash chain */
-       struct  pseminfo *pseminfo;             /* vnode the name refers to */
-       int     psem_nlen;              /* length of name */
-       char    psem_name[PSEMNAMLEN + 1];      /* segment name */
+#define PSEM_NONE       1
+#define PSEM_DEFINED    2
+#define PSEM_ALLOCATED  4
+#define PSEM_MAPPED     8
+#define PSEM_INUSE      0x10
+#define PSEM_REMOVED    0x20
+#define PSEM_INCREATE   0x40
+#define PSEM_INDELETE   0x80
+
+struct  psemcache {
+       LIST_ENTRY(psemcache) psem_hash;        /* hash chain */
+       struct  pseminfo *pseminfo;             /* vnode the name refers to */
+       int     psem_nlen;              /* length of name */
+       char    psem_name[PSEMNAMLEN + 1];      /* segment name */

 };
 #define PSEMCACHE_NULL (struct psemcache *)0
 
 };
 #define PSEMCACHE_NULL (struct psemcache *)0
 

-struct psemstats {
-       long    goodhits;               /* hits that we can really use */
-       long    neghits;                /* negative hits that we can use */
-       long    badhits;                /* hits we must drop */
-       long    falsehits;              /* hits with id mismatch */
-       long    miss;           /* misses */
-       long    longnames;              /* long names that ignore cache */
+#define PSEMCACHE_NOTFOUND (0)
+#define PSEMCACHE_FOUND    (-1)
+#define PSEMCACHE_NEGATIVE (ENOENT)
+
+struct  psemstats {
+       long    goodhits;               /* hits that we can really use */
+       long    neghits;                /* negative hits that we can use */
+       long    badhits;                /* hits we must drop */
+       long    falsehits;              /* hits with id mismatch */
+       long    miss;           /* misses */
+       long    longnames;              /* long names that ignore cache */

 };
 
 struct psemname {
 };
 
 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 */
+       char    *psem_nameptr;  /* pointer to looked up name */
+       long    psem_namelen;   /* length of looked up component */
+       u_int32_t       psem_hash;      /* hash value of looked up name */

 };
 
 struct psemnode {
 };
 
 struct psemnode {


@@ -140,36 +155,35 @@ struct psemnode {
 
 #define PSEMHASH(pnp) \
        (&psemhashtbl[(pnp)->psem_hash & psemhash])
 
 #define PSEMHASH(pnp) \
        (&psemhashtbl[(pnp)->psem_hash & psemhash])

-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,  0, "Posix");
-SYSCTL_NODE(_kern_posix, OID_AUTO, sem, CTLFLAG_RW, 0, "Semaphores");
-SYSCTL_INT (_kern_posix_sem, OID_AUTO, max, CTLFLAG_RW, &posix_sem_max, 0, "max");
+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 | CTLFLAG_LOCKED, &posix_sem_max, "max");

 
 

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

 
 static int psem_access(struct pseminfo *pinfo, int mode, kauth_cred_t cred);
 static int psem_cache_search(struct pseminfo **,
 
 static int psem_access(struct pseminfo *pinfo, int mode, kauth_cred_t cred);
 static int psem_cache_search(struct pseminfo **,

-                               struct psemname *, struct psemcache **);
+    struct psemname *, struct psemcache **);

 static int psem_delete(struct pseminfo * pinfo);
 
 static int psem_delete(struct pseminfo * pinfo);
 

-static int psem_read (struct fileproc *fp, struct uio *uio,
-                           kauth_cred_t cred, int flags, struct proc *p);
-static int psem_write (struct fileproc *fp, struct uio *uio,
-                           kauth_cred_t cred, int flags, struct proc *p);
-static int psem_ioctl (struct fileproc *fp, u_long com,
-                           caddr_t data, struct proc *p);
-static int psem_select (struct fileproc *fp, int which, void *wql, struct proc *p);
-static int psem_closefile (struct fileglob *fp, struct proc *p);
-
-static int psem_kqfilter (struct fileproc *fp, struct knote *kn, struct proc *p);
-
-struct         fileops psemops =
-       { psem_read, psem_write, psem_ioctl, psem_select, psem_closefile, psem_kqfilter, 0 };
-
+static int psem_closefile(struct fileglob *fp, vfs_context_t ctx);
+static int psem_unlink_internal(struct pseminfo *pinfo, struct psemcache *pcache);
+
+static const struct fileops psemops = {
+       .fo_type     = DTYPE_PSXSEM,
+       .fo_read     = fo_no_read,
+       .fo_write    = fo_no_write,
+       .fo_ioctl    = fo_no_ioctl,
+       .fo_select   = fo_no_select,
+       .fo_close    = psem_closefile,
+       .fo_drain    = fo_no_drain,
+       .fo_kqfilter = fo_no_kqfilter,
+};

 
 static lck_grp_t       *psx_sem_subsys_lck_grp;
 static lck_grp_attr_t  *psx_sem_subsys_lck_grp_attr;
 
 static lck_grp_t       *psx_sem_subsys_lck_grp;
 static lck_grp_attr_t  *psx_sem_subsys_lck_grp_attr;


@@ -178,28 +192,30 @@ 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)
 
 #define PSEM_SUBSYS_LOCK() lck_mtx_lock(& psx_sem_subsys_mutex)
 #define PSEM_SUBSYS_UNLOCK() lck_mtx_unlock(& psx_sem_subsys_mutex)

+#define PSEM_SUBSYS_ASSERT_HELD() LCK_MTX_ASSERT(&psx_sem_subsys_mutex, LCK_MTX_ASSERT_OWNED)

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

+static void psem_cache_delete(struct psemcache *pcp);
+int psem_cache_purge_all(proc_t);
+
+

 /* Initialize the mutex governing access to the posix sem subsystem */
 __private_extern__ void
 psem_lock_init( void )
 {
 /* 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_attr = lck_grp_attr_alloc_init();
-    lck_grp_attr_setstat(psx_sem_subsys_lck_grp_attr);
+       psx_sem_subsys_lck_grp = lck_grp_alloc_init("posix shared memory", psx_sem_subsys_lck_grp_attr);

 
 

-    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_attr_setdebug(psx_sem_subsys_lck_attr); */
-    lck_mtx_init(& psx_sem_subsys_mutex, psx_sem_subsys_lck_grp, psx_sem_subsys_lck_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
+ *
+ *

  * status of -1 is returned if matches
  * If the lookup determines that the name does not exist
  * (negative cacheing), a status of ENOENT is returned. If the lookup
  * status of -1 is returned if matches
  * If the lookup determines that the name does not exist
  * (negative cacheing), a status of ENOENT is returned. If the lookup


@@ -207,39 +223,38 @@ psem_lock_init( void )
  */
 
 static int
  */
 
 static int

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

 {
        struct psemcache *pcp, *nnp;
        struct psemhashhead *pcpp;
 
        if (pnp->psem_namelen > PSEMNAMLEN) {
                psemstats.longnames++;
 {
        struct psemcache *pcp, *nnp;
        struct psemhashhead *pcpp;
 
        if (pnp->psem_namelen > PSEMNAMLEN) {
                psemstats.longnames++;

-               return (0);
+               return PSEMCACHE_NOTFOUND;

        }
 
        pcpp = PSEMHASH(pnp);
        for (pcp = pcpp->lh_first; pcp != 0; pcp = nnp) {
                nnp = pcp->psem_hash.le_next;
                if (pcp->psem_nlen == pnp->psem_namelen &&
        }
 
        pcpp = PSEMHASH(pnp);
        for (pcp = pcpp->lh_first; pcp != 0; pcp = nnp) {
                nnp = pcp->psem_hash.le_next;
                if (pcp->psem_nlen == pnp->psem_namelen &&

-                   !bcmp(pcp->psem_name, pnp->psem_nameptr,                                            (u_int)pcp-> psem_nlen))
+                   !bcmp(pcp->psem_name, pnp->psem_nameptr, (u_int)pcp->psem_nlen)) {

                        break;
                        break;

+               }

        }
 
        if (pcp == 0) {
                psemstats.miss++;
        }
 
        if (pcp == 0) {
                psemstats.miss++;

-               return (0);
+               return PSEMCACHE_NOTFOUND;

        }
 
        /* We found a "positive" match, return the vnode */
        }
 
        /* We found a "positive" match, return the vnode */

-        if (pcp->pseminfo) {
+       if (pcp->pseminfo) {

                psemstats.goodhits++;
                /* TOUCH(ncp); */
                *psemp = pcp->pseminfo;
                *pcache = pcp;
                psemstats.goodhits++;
                /* TOUCH(ncp); */
                *psemp = pcp->pseminfo;
                *pcache = pcp;

-               return (-1);
+               return PSEMCACHE_FOUND;

        }
 
        /*
        }
 
        /*


@@ -247,7 +262,7 @@ psem_cache_search(psemp, pnp, pcache)
         * The nc_vpid field records whether this is a whiteout.
         */
        psemstats.neghits++;
         * The nc_vpid field records whether this is a whiteout.
         */
        psemstats.neghits++;

-       return (ENOENT);
+       return PSEMCACHE_NEGATIVE;

 }
 
 /*
 }
 
 /*


@@ -261,17 +276,19 @@ psem_cache_add(struct pseminfo *psemp, struct psemname *pnp, struct psemcache *p
        struct psemcache *dpcp;
 
 #if DIAGNOSTIC
        struct psemcache *dpcp;
 
 #if DIAGNOSTIC

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

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

+       }

 #endif
 
 
        /*  if the entry has already been added by some one else return */
 #endif
 
 
        /*  if the entry has already been added by some one else return */

-       if (psem_cache_search(&dpinfo, pnp, &dpcp) == -1) {
-               return(EEXIST);
+       if (psem_cache_search(&dpinfo, pnp, &dpcp) == PSEMCACHE_FOUND) {
+               return EEXIST;
+       }
+       if (psemnument >= posix_sem_max) {
+               return ENOSPC;

        }
        }

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

        psemnument++;
        /*
         * Fill in cache info, if vp is NULL this is a "negative" cache entry.
        psemnument++;
        /*
         * Fill in cache info, if vp is NULL this is a "negative" cache entry.


@@ -287,13 +304,15 @@ psem_cache_add(struct pseminfo *psemp, struct psemname *pnp, struct psemcache *p
        {
                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) {

                                panic("psem:cache_enter duplicate");
                                panic("psem:cache_enter duplicate");

+                       }
+               }

        }
 #endif
        LIST_INSERT_HEAD(pcpp, pcp, psem_hash);
        }
 #endif
        LIST_INSERT_HEAD(pcpp, pcp, psem_hash);

-       return(0);
+       return 0;

 }
 
 /*
 }
 
 /*


@@ -302,77 +321,103 @@ psem_cache_add(struct pseminfo *psemp, struct psemname *pnp, struct psemcache *p
 void
 psem_cache_init(void)
 {
 void
 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
 }
 
 static void
 psem_cache_delete(struct psemcache *pcp)
 {
 #if DIAGNOSTIC

-       if (pcp->psem_hash.le_prev == 0)
+       if (pcp->psem_hash.le_prev == 0) {

                panic("psem namecache purge le_prev");
                panic("psem namecache purge le_prev");

-       if (pcp->psem_hash.le_next == pcp)
+       }
+       if (pcp->psem_hash.le_next == pcp) {

                panic("namecache purge le_next");
                panic("namecache purge le_next");

+       }

 #endif /* DIAGNOSTIC */
        LIST_REMOVE(pcp, psem_hash);
 #endif /* DIAGNOSTIC */
        LIST_REMOVE(pcp, psem_hash);

-       pcp->psem_hash.le_prev = 0;     
+       pcp->psem_hash.le_prev = NULL;

        psemnument--;
 }
 
        psemnument--;
 }
 

-#if NOT_USED

 /*
 /*

- * Invalidate a all entries to particular vnode.
- * 
- * We actually just increment the v_id, that will do it. The entries will
- * be purged by lookup as they get found. If the v_id wraps around, we
- * need to ditch the entire cache, to avoid confusion. No valid vnode will
- * ever have (v_id == 0).
+ * Remove all cached psem entries. Open semaphores (with a positive refcount)
+ * will continue to exist, but their cache entries tying them to a particular
+ * name/path will be removed making all future lookups on the name fail.

  */
  */

-static void
-psem_cache_purge(void)
+int
+psem_cache_purge_all(__unused proc_t p)

 {
 {

-       struct psemcache *pcp;
+       struct psemcache *pcp, *tmppcp;

        struct psemhashhead *pcpp;
        struct psemhashhead *pcpp;

+       int error = 0;

 
 

+       if (kauth_cred_issuser(kauth_cred_get()) == 0) {
+               return EPERM;
+       }
+
+       PSEM_SUBSYS_LOCK();

        for (pcpp = &psemhashtbl[psemhash]; pcpp >= psemhashtbl; pcpp--) {
        for (pcpp = &psemhashtbl[psemhash]; pcpp >= psemhashtbl; pcpp--) {

-               while ( (pcp = pcpp->lh_first) )
-                       psem_cache_delete(pcp);
+               LIST_FOREACH_SAFE(pcp, pcpp, psem_hash, tmppcp) {
+                       assert(pcp->psem_nlen);
+                       /*
+                        * unconditionally unlink the cache entry
+                        */
+                       error = psem_unlink_internal(pcp->pseminfo, pcp);
+                       if (error) {
+                               goto out;
+                       }
+               }
+       }
+       assert(psemnument == 0);
+
+out:
+       PSEM_SUBSYS_UNLOCK();
+
+       if (error) {
+               printf("%s: Error %d removing all semaphores: %ld remain!\n",
+                   __func__, error, psemnument);

        }
        }

+       return error;

 }
 }

-#endif /* NOT_USED */

 
 int
 
 int

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

 {
 {

-       struct fileproc *fp;

        size_t i;
        size_t i;

-       struct fileproc *nfp;

        int indx, error;
        struct psemname nd;
        struct pseminfo *pinfo;
        int indx, error;
        struct psemname nd;
        struct pseminfo *pinfo;

-       struct psemcache *pcp;
-       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;

-       int fmode ;
+       int fmode;

        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(fflags, uap->oflag);
        AUDIT_ARG(mode, uap->mode);

-       AUDIT_ARG(value, uap->value);
+       AUDIT_ARG(value32, uap->value);

 
        pinfo = PSEMINFO_NULL;
 
 
        pinfo = PSEMINFO_NULL;
 

-       MALLOC_ZONE(pnbuf, caddr_t, MAXPATHLEN, M_NAMEI, M_WAITOK);
-       if (pnbuf == NULL)
-               return(ENOSPC);
+       /*
+        * 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 | M_ZERO);
+       if (pnbuf == NULL) {
+               error = ENOSPC;
+               goto bad;
+       }

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


@@ -380,7 +425,7 @@ sem_open(struct proc *p, struct sem_open_args *uap, user_addr_t *retval)
                goto bad;
        }
        AUDIT_ARG(text, pnbuf);
                goto bad;
        }
        AUDIT_ARG(text, pnbuf);

-       if ( (pathlen > PSEMNAMLEN) ) {
+       if ((pathlen > PSEMNAMLEN)) {

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


@@ -393,7 +438,7 @@ sem_open(struct proc *p, struct sem_open_args *uap, user_addr_t *retval)
                        error = EINVAL;
                        goto bad;
                }
                        error = EINVAL;
                        goto bad;
                }

-        } else {
+       } else {

                error = EINVAL;
                goto bad;
        }
                error = EINVAL;
                goto bad;
        }


@@ -403,170 +448,232 @@ sem_open(struct proc *p, struct sem_open_args *uap, user_addr_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;

        }
 
        }
 

-#if KTRACE
-       if (KTRPOINT(p, KTR_NAMEI))
-               ktrnamei(p->p_tracep, nameptr);
-#endif
-       
-       PSEM_SUBSYS_LOCK();
-       error = psem_cache_search(&pinfo, &nd, &pcache);
+       /*
+        * 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;
+       }

 
 

-       if (error == ENOENT) {
-               PSEM_SUBSYS_UNLOCK();
-               error = EINVAL;
+       /*
+        * 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;
                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 (!error) {
-               incache = 0;
-       } else
-               incache = 1;
+#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);
 
        fmode = FFLAGS(uap->oflag);
 

-       PSEM_SUBSYS_UNLOCK();
-       error = falloc(p, &nfp, &indx);
-       if (error)
+       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;
                goto bad;

+       }

 
        PSEM_SUBSYS_LOCK();
 
        PSEM_SUBSYS_LOCK();

-       fp = nfp;
+       error = psem_cache_search(&pinfo, &nd, &pcache);
+
+       if (error == PSEMCACHE_NEGATIVE) {
+               error = EINVAL;
+               goto bad_locked;
+       }
+
+       if (error == PSEMCACHE_FOUND) {
+               incache = 1;
+       } else {
+               incache = 0;
+       }
+

        cmode &=  ALLPERMS;
 
        cmode &=  ALLPERMS;
 

-       if (((fmode & (O_CREAT | O_EXCL))==(O_CREAT | O_EXCL)) &&  incache) {
+       if (((fmode & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL)) && incache) {

                /* sem exists and opened O_EXCL */
 #if notyet
                if (pinfo->psem_flags & PSEM_INDELETE) {
                }
                /* sem exists and opened O_EXCL */
 #if notyet
                if (pinfo->psem_flags & PSEM_INDELETE) {
                }

-#endif 
+#endif

                AUDIT_ARG(posix_ipc_perm, pinfo->psem_uid,
                AUDIT_ARG(posix_ipc_perm, pinfo->psem_uid,

-                       pinfo->psem_gid, pinfo->psem_mode);
-               PSEM_SUBSYS_UNLOCK();
+                   pinfo->psem_gid, pinfo->psem_mode);

                error = EEXIST;
                error = EEXIST;

-               goto bad1;
+               goto bad_locked;

        }
        }

-       if (((fmode & (O_CREAT | O_EXCL))== O_CREAT) &&  incache) {
+       if (((fmode & (O_CREAT | O_EXCL)) == O_CREAT) && incache) {

                /* As per POSIX, O_CREAT has no effect */
                fmode &= ~O_CREAT;
        }
 
                /* As per POSIX, O_CREAT has no effect */
                fmode &= ~O_CREAT;
        }
 

-       if ( (fmode & O_CREAT) ) {
-               if((value < 0) && (value > SEM_VALUE_MAX)) {
-                       PSEM_SUBSYS_UNLOCK();
-                       error = EINVAL;
-                       goto bad1;
-               }
-               PSEM_SUBSYS_UNLOCK();
-               MALLOC(pinfo, struct pseminfo *, sizeof(struct pseminfo), M_SHM, M_WAITOK|M_ZERO);
-               if (pinfo == NULL) {
-                       error = ENOSPC;
-                       goto bad1;
-               }
-               PSEM_SUBSYS_LOCK();
-
-               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 = kauth_cred_getuid(kauth_cred_get());
-               pinfo->psem_gid = kauth_cred_get()->cr_gid;
-               PSEM_SUBSYS_UNLOCK();
-               kret = semaphore_create(kernel_task, &pinfo->psem_semobject,
-                            SYNC_POLICY_FIFO, value);
-               if(kret != KERN_SUCCESS) 
-                       goto bad3;
-               PSEM_SUBSYS_LOCK();
+               pinfo->psem_uid = kauth_getuid();
+               pinfo->psem_gid = kauth_getgid();
+               bcopy(pnbuf, &pinfo->psem_name[0], PSEMNAMLEN);
+               pinfo->psem_name[PSEMNAMLEN] = 0;

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

-               pinfo->sem_proc = p;
+               pinfo->psem_creator_pid = p->p_pid;
+               pinfo->psem_creator_uniqueid = p->p_uniqueid;
+
+#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) {
        } else {
                /* semaphore should exist as it is without  O_CREAT */
                if (!incache) {

-                       PSEM_SUBSYS_UNLOCK();

                        error = ENOENT;
                        error = ENOENT;

-                       goto bad1;
+                       goto bad_locked;

                }
                }

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

                        error = ENOENT;
                        error = ENOENT;

-                       goto bad1;
-               }       
+                       goto bad_locked;
+               }

                AUDIT_ARG(posix_ipc_perm, pinfo->psem_uid,
                AUDIT_ARG(posix_ipc_perm, pinfo->psem_uid,

-                       pinfo->psem_gid, pinfo->psem_mode);
-               if ( (error = psem_access(pinfo, fmode, kauth_cred_get())) ) {
-                       PSEM_SUBSYS_UNLOCK();
-                       goto bad1;
+                   pinfo->psem_gid, pinfo->psem_mode);
+#if CONFIG_MACF
+               error = mac_posixsem_check_open(kauth_cred_get(), pinfo);
+               if (error) {
+                       goto bad_locked;

                }
                }

-       }
-       PSEM_SUBSYS_UNLOCK();
-       MALLOC(pnode, struct psemnode *, sizeof(struct psemnode), M_SHM, M_WAITOK|M_ZERO);
-       if (pnode == NULL) {
-               error = ENOSPC;
-               goto bad1;
-       }
-       if (!incache) {
-               /*
-               * 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 == NULL) {
-                       error = ENOMEM;
-                       goto bad2;
+#endif
+               if ((error = psem_access(pinfo, fmode, kauth_cred_get()))) {
+                       goto bad_locked;

                }
                }

-

        }
        }

-       PSEM_SUBSYS_LOCK();
+

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

-               if ( (error = psem_cache_add(pinfo, &nd, pcp)) ) {
-                       PSEM_SUBSYS_UNLOCK();
-                       FREE(pcp, M_SHM);
-                       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;
+       new_pnode->pinfo = pinfo;

        PSEM_SUBSYS_UNLOCK();
 
        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;
        proc_fdlock(p);
        fp->f_flag = fmode & FMASK;

-       fp->f_type = DTYPE_PSXSEM;

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

-       fp->f_data = (caddr_t)pnode;
-       *fdflags(p, indx) &= ~UF_RESERVED;
+       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);
        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);
-bad1:
-       if (pinfo_alloc)
-               FREE(pinfo, M_SHM);
-       fp_free(p, indx, nfp);
+bad_locked:
+       PSEM_SUBSYS_UNLOCK();

 bad:
 bad:

-       FREE_ZONE(pnbuf, MAXPATHLEN, M_NAMEI);
-       return (error);
+       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;

 }
 
 /*
 }
 
 /*


@@ -575,60 +682,71 @@ bad:
 static int
 psem_access(struct pseminfo *pinfo, int mode, kauth_cred_t cred)
 {
 static int
 psem_access(struct pseminfo *pinfo, int mode, kauth_cred_t cred)
 {

-       mode_t mask;
-       int is_member;
+       int mode_req = ((mode & FREAD) ? S_IRUSR : 0) |
+           ((mode & FWRITE) ? S_IWUSR : 0);

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

-       if (!suser(cred, NULL))
-               return (0);
-
-       mask = 0;
-
-       /* Otherwise, check the owner. */
-       if (kauth_cred_getuid(cred) == pinfo->psem_uid) {
-               if (mode & FREAD)
-                       mask |= S_IRUSR;
-               if (mode & FWRITE)
-                       mask |= S_IWUSR;
-               return ((pinfo->psem_mode & mask) == mask ? 0 : EACCES);
-       }
-
-       /* Otherwise, check the groups. */
-       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)
-               mask |= S_IROTH;
-       if (mode & FWRITE)
-               mask |= S_IWOTH;
-       return ((pinfo->psem_mode & mask) == mask ? 0 : EACCES);
+       if (!suser(cred, NULL)) {
+               return 0;
+       }
+
+       return posix_cred_access(cred, pinfo->psem_uid, pinfo->psem_gid, pinfo->psem_mode, mode_req);
+}
+
+static int
+psem_unlink_internal(struct pseminfo *pinfo, struct psemcache *pcache)
+{
+       PSEM_SUBSYS_ASSERT_HELD();
+
+       if (!pinfo || !pcache) {
+               return EINVAL;
+       }
+
+       if ((pinfo->psem_flags & (PSEM_DEFINED | PSEM_ALLOCATED)) == 0) {
+               return EINVAL;
+       }
+
+       if (pinfo->psem_flags & PSEM_INDELETE) {
+               return 0;
+       }
+
+       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);
+               FREE(pinfo, M_SHM);
+       } else {
+               pinfo->psem_flags |= PSEM_REMOVED;
+       }
+
+       psem_cache_delete(pcache);
+       FREE(pcache, M_SHM);
+       return 0;

 }
 
 }
 

+

 int
 int

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

 {
        size_t i;
 {
        size_t i;

-       int error=0;
+       int error = 0;

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

-       char * pnbuf;

        char * nameptr;
        char * cp;
        char * nameptr;
        char * cp;

-       size_t pathlen, plen;
-       int incache = 0;
+       char * pnbuf;
+       size_t pathlen;

        struct psemcache *pcache = PSEMCACHE_NULL;
 
        pinfo = PSEMINFO_NULL;
 
        MALLOC_ZONE(pnbuf, caddr_t, MAXPATHLEN, M_NAMEI, M_WAITOK);
        if (pnbuf == NULL) {
        struct psemcache *pcache = PSEMCACHE_NULL;
 
        pinfo = PSEMINFO_NULL;
 
        MALLOC_ZONE(pnbuf, caddr_t, MAXPATHLEN, M_NAMEI, M_WAITOK);
        if (pnbuf == NULL) {

-               return(ENOSPC);         /* XXX non-standard */
+               return ENOSPC;         /* XXX non-standard */

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


@@ -641,119 +759,111 @@ sem_unlink(__unused struct proc *p, struct sem_unlink_args *uap, __unused regist
                goto bad;
        }
 
                goto bad;
        }
 

+       nameptr = pnbuf;

 
 #ifdef PSXSEM_NAME_RESTRICT
 
 #ifdef PSXSEM_NAME_RESTRICT

-       nameptr = pnbuf;

        if (*nameptr == '/') {
                while (*(nameptr++) == '/') {
        if (*nameptr == '/') {
                while (*(nameptr++) == '/') {

-                       plen--;
+                       pathlen--;

                        error = EINVAL;
                        goto bad;
                }
                        error = EINVAL;
                        goto bad;
                }

-        } else {
+       } else {

                error = EINVAL;
                goto bad;
        }
 #endif /* PSXSEM_NAME_RESTRICT */
 
                error = EINVAL;
                goto bad;
        }
 #endif /* PSXSEM_NAME_RESTRICT */
 

-       plen = pathlen;
-       nameptr = pnbuf;

        nd.psem_nameptr = nameptr;
        nd.psem_nameptr = nameptr;

-       nd.psem_namelen = plen;
-       nd. psem_hash =0;
+       nd.psem_namelen = pathlen;
+       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 <= pathlen; i++, cp++) {
+               nd.psem_hash += (unsigned char)*cp * i;

        }
 
        PSEM_SUBSYS_LOCK();
        error = psem_cache_search(&pinfo, &nd, &pcache);
 
        }
 
        PSEM_SUBSYS_LOCK();
        error = psem_cache_search(&pinfo, &nd, &pcache);
 

-       if (error == ENOENT) {
-               PSEM_SUBSYS_UNLOCK();
-               error = EINVAL;
-               goto bad;
-
-       }
-       if (!error) {
-               PSEM_SUBSYS_UNLOCK();
-               error = EINVAL;
-               goto bad;
-       } else
-               incache = 1;
-       if ( (error = psem_access(pinfo, pinfo->psem_mode, kauth_cred_get())) ) {
+       if (error != PSEMCACHE_FOUND) {

                PSEM_SUBSYS_UNLOCK();
                PSEM_SUBSYS_UNLOCK();

+               error = ENOENT;

                goto bad;
        }
 
                goto bad;
        }
 

-       if ((pinfo->psem_flags & (PSEM_DEFINED | PSEM_ALLOCATED))==0) {
+#if CONFIG_MACF
+       error = mac_posixsem_check_unlink(kauth_cred_get(), pinfo, nameptr);
+       if (error) {

                PSEM_SUBSYS_UNLOCK();
                PSEM_SUBSYS_UNLOCK();

-               return (EINVAL);
+               goto bad;

        }
        }

-
-       if ( (pinfo->psem_flags & PSEM_INDELETE) ) {
+#endif
+       if ((error = psem_access(pinfo, pinfo->psem_mode, kauth_cred_get()))) {

                PSEM_SUBSYS_UNLOCK();
                PSEM_SUBSYS_UNLOCK();

-               error = 0;

                goto bad;
        }
 
                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);
-               FREE(pinfo,M_SHM);
-       } else
-               pinfo->psem_flags |= PSEM_REMOVED;
-
-       psem_cache_delete(pcache);
+       error = psem_unlink_internal(pinfo, pcache);

        PSEM_SUBSYS_UNLOCK();
        PSEM_SUBSYS_UNLOCK();

-       FREE(pcache, M_SHM);
-       error = 0;
+

 bad:
        FREE_ZONE(pnbuf, MAXPATHLEN, M_NAMEI);
 bad:
        FREE_ZONE(pnbuf, MAXPATHLEN, M_NAMEI);

-       return (error);
+       return error;

 }
 
 int
 }
 
 int

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

 {
 {

-       int fd = CAST_DOWN(int,uap->sem);
+       int fd = CAST_DOWN_EXPLICIT(int, uap->sem);

        struct fileproc *fp;
        int error = 0;
 
        AUDIT_ARG(fd, fd); /* XXX This seems wrong; uap->sem is a pointer */
 
        proc_fdlock(p);
        struct fileproc *fp;
        int error = 0;
 
        AUDIT_ARG(fd, fd); /* XXX This seems wrong; uap->sem is a pointer */
 
        proc_fdlock(p);

-       error = fp_lookup(p,fd, &fp, 1);
+       error = fp_lookup(p, fd, &fp, 1);

        if (error) {
                proc_fdunlock(p);
        if (error) {
                proc_fdunlock(p);

-               return(error);
+               return error;
+       }
+       if (fp->f_type != DTYPE_PSXSEM) {
+               fp_drop(p, fd, fp, 1);
+               proc_fdunlock(p);
+               return EBADF;

        }
        }

+       procfdtbl_markclosefd(p, fd);
+       /* release the ref returned from fp_lookup before calling drain */
+       (void) os_ref_release_locked(&fp->f_iocount);
+       fileproc_drain(p, fp);

        fdrelse(p, fd);
        error = closef_locked(fp, fp->f_fglob, p);
        fdrelse(p, fd);
        error = closef_locked(fp, fp->f_fglob, p);

-       FREE_ZONE(fp, sizeof *fp, M_FILEPROC);
+       fileproc_free(fp);

        proc_fdunlock(p);
        proc_fdunlock(p);

-       return(error);
+       return error;

 }
 
 int
 }
 
 int

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

 {
 {

-       int fd = CAST_DOWN(int,uap->sem);
+       __pthread_testcancel(1);
+       return sem_wait_nocancel(p, (struct sem_wait_nocancel_args *)uap, retval);
+}
+
+int
+sem_wait_nocancel(proc_t p, struct sem_wait_nocancel_args *uap, __unused int32_t *retval)
+{
+       int fd = CAST_DOWN_EXPLICIT(int, uap->sem);

        struct fileproc *fp;
        struct pseminfo * pinfo;
        struct fileproc *fp;
        struct pseminfo * pinfo;

-       struct psemnode * pnode ;
+       struct psemnode * pnode;

        kern_return_t kret;
        int error;
 
        error = fp_getfpsem(p, fd, &fp, &pnode);
        kern_return_t kret;
        int error;
 
        error = fp_getfpsem(p, fd, &fp, &pnode);

-       if (error)
-               return (error);
-       if (((pnode = (struct psemnode *)fp->f_data)) == PSEMNODE_NULL )  {
+       if (error) {
+               return error;
+       }
+       if (((pnode = (struct psemnode *)fp->f_data)) == PSEMNODE_NULL) {

                error = EINVAL;
                goto out;
        }
                error = EINVAL;
                goto out;
        }


@@ -763,13 +873,19 @@ sem_wait(struct proc *p, struct sem_wait_args *uap, __unused register_t *retval)
                error = EINVAL;
                goto out;
        }
                error = EINVAL;
                goto out;
        }

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

                PSEM_SUBSYS_UNLOCK();
                error = EINVAL;
                goto out;
        }
                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) {
        PSEM_SUBSYS_UNLOCK();
        kret = semaphore_wait(pinfo->psem_semobject);
        switch (kret) {


@@ -790,25 +906,25 @@ sem_wait(struct proc *p, struct sem_wait_args *uap, __unused register_t *retval)
        }
 out:
        fp_drop(p, fd, fp, 0);
        }
 out:
        fp_drop(p, fd, fp, 0);

-       return(error);
-
+       return error;

 }
 
 int
 }
 
 int

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

 {
 {

-       int fd = CAST_DOWN(int,uap->sem);
+       int fd = CAST_DOWN_EXPLICIT(int, uap->sem);

        struct fileproc *fp;
        struct pseminfo * pinfo;
        struct fileproc *fp;
        struct pseminfo * pinfo;

-       struct psemnode * pnode ;
+       struct psemnode * pnode;

        kern_return_t kret;
        mach_timespec_t wait_time;
        int error;
        kern_return_t kret;
        mach_timespec_t wait_time;
        int error;

-       
+

        error = fp_getfpsem(p, fd, &fp, &pnode);
        error = fp_getfpsem(p, fd, &fp, &pnode);

-       if (error)
-               return (error);
-       if (((pnode = (struct psemnode *)fp->f_data)) == PSEMNODE_NULL )  {
+       if (error) {
+               return error;
+       }
+       if (((pnode = (struct psemnode *)fp->f_data)) == PSEMNODE_NULL) {

                error = EINVAL;
                goto out;
        }
                error = EINVAL;
                goto out;
        }


@@ -818,13 +934,19 @@ sem_trywait(struct proc *p, struct sem_trywait_args *uap, __unused register_t *r
                error = EINVAL;
                goto out;
        }
                error = EINVAL;
                goto out;
        }

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

                PSEM_SUBSYS_UNLOCK();
                error = EINVAL;
                goto out;
        }
                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;
        PSEM_SUBSYS_UNLOCK();
        wait_time.tv_sec = 0;
        wait_time.tv_nsec = 0;


@@ -850,23 +972,24 @@ sem_trywait(struct proc *p, struct sem_trywait_args *uap, __unused register_t *r
        }
 out:
        fp_drop(p, fd, fp, 0);
        }
 out:
        fp_drop(p, fd, fp, 0);

-       return(error);
+       return error;

 }
 
 int
 }
 
 int

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

 {
 {

-       int fd = CAST_DOWN(int,uap->sem);
+       int fd = CAST_DOWN_EXPLICIT(int, uap->sem);

        struct fileproc *fp;
        struct pseminfo * pinfo;
        struct fileproc *fp;
        struct pseminfo * pinfo;

-       struct psemnode * pnode ;
+       struct psemnode * pnode;

        kern_return_t kret;
        int error;
 
        error = fp_getfpsem(p, fd, &fp, &pnode);
        kern_return_t kret;
        int error;
 
        error = fp_getfpsem(p, fd, &fp, &pnode);

-       if (error)
-               return (error);
-       if (((pnode = (struct psemnode *)fp->f_data)) == PSEMNODE_NULL )  {
+       if (error) {
+               return error;
+       }
+       if (((pnode = (struct psemnode *)fp->f_data)) == PSEMNODE_NULL) {

                error = EINVAL;
                goto out;
        }
                error = EINVAL;
                goto out;
        }


@@ -876,13 +999,19 @@ sem_post(struct proc *p, struct sem_post_args *uap, __unused register_t *retval)
                error = EINVAL;
                goto out;
        }
                error = EINVAL;
                goto out;
        }

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

                PSEM_SUBSYS_UNLOCK();
                error = EINVAL;
                goto out;
        }
                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) {
        PSEM_SUBSYS_UNLOCK();
        kret = semaphore_signal(pinfo->psem_semobject);
        switch (kret) {


@@ -903,133 +1032,132 @@ sem_post(struct proc *p, struct sem_post_args *uap, __unused register_t *retval)
        }
 out:
        fp_drop(p, fd, fp, 0);
        }
 out:
        fp_drop(p, fd, fp, 0);

-       return(error);
-}
-
-int
-sem_init(__unused struct proc *p, __unused struct sem_init_args *uap, __unused register_t *retval)
-{
-       return(ENOSYS);
-}
-
-int
-sem_destroy(__unused struct proc *p, __unused struct sem_destroy_args *uap, __unused register_t *retval)
-{
-       return(ENOSYS);
-}
-
-int
-sem_getvalue(__unused struct proc *p, __unused struct sem_getvalue_args *uap, __unused register_t *retval)
-{
-       return(ENOSYS);
+       return error;

 }
 
 static int
 }
 
 static int

-psem_close(struct psemnode *pnode, __unused int flags, 
-               __unused kauth_cred_t cred, __unused struct proc *p)
+psem_close(struct psemnode *pnode, __unused int flags)

 {
 {

-       int error=0;
-       register struct pseminfo *pinfo;
+       int error = 0;
+       struct pseminfo *pinfo;

 
        PSEM_SUBSYS_LOCK();
 
        PSEM_SUBSYS_LOCK();

-       if ((pinfo = pnode->pinfo) == PSEMINFO_NULL){
+       if ((pinfo = pnode->pinfo) == PSEMINFO_NULL) {

                PSEM_SUBSYS_UNLOCK();
                PSEM_SUBSYS_UNLOCK();

-               return(EINVAL);
+               return EINVAL;

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

-               return(EINVAL);
+               return EINVAL;

        }
 #if DIAGNOSTIC
        }
 #if DIAGNOSTIC

-       if(!pinfo->psem_usecount) {
+       if (!pinfo->psem_usecount) {

                kprintf("negative usecount in psem_close\n");
        }
 #endif /* DIAGNOSTIC */
        pinfo->psem_usecount--;
 
                kprintf("negative usecount in psem_close\n");
        }
 #endif /* DIAGNOSTIC */
        pinfo->psem_usecount--;
 

-       if ((pinfo->psem_flags & PSEM_REMOVED) && !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);
                PSEM_SUBSYS_UNLOCK();
                /* lock dropped as only semaphore is destroyed here */
                error = psem_delete(pinfo);

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

        } else {
                PSEM_SUBSYS_UNLOCK();
        }
        /* subsystem lock is dropped when we get here */
        FREE(pnode, M_SHM);
        } else {
                PSEM_SUBSYS_UNLOCK();
        }
        /* subsystem lock is dropped when we get here */
        FREE(pnode, M_SHM);

-       return (error);
+       return error;

 }
 
 static int
 }
 
 static int

-psem_closefile(fg, p)
-       struct fileglob *fg;
-       struct proc *p;
+psem_closefile(struct fileglob *fg, __unused vfs_context_t ctx)

 {
        int error;
 
 {
        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,
-               fg->fg_cred, p);
+       /*
+        * 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);
+       return error;

 }
 
 }
 

-static int 
+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:
        case KERN_PROTECTION_FAILURE:
 
        switch (kret) {
        case KERN_INVALID_ADDRESS:
        case KERN_PROTECTION_FAILURE:

-               return (EINVAL);
+               return EINVAL;

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

-               return (EINTR);
+               return EINTR;

        case KERN_SUCCESS:
        case KERN_SUCCESS:

-               return(0);
+               return 0;

        default:
        default:

-               return (EINVAL);
+               return EINVAL;

        }
 }
 
        }
 }
 

-static int
-psem_read(__unused struct fileproc *fp, __unused struct uio *uio, 
-                 __unused kauth_cred_t cred, __unused int flags, 
-                 __unused struct proc *p)
+int
+fill_pseminfo(struct psemnode *pnode, struct psem_info * info)

 {
 {

-       return(ENOTSUP);
-}
+       struct pseminfo *pinfo;
+       struct vinfo_stat  *sb;

 
 

-static int
-psem_write(__unused struct fileproc *fp, __unused struct uio *uio, 
-                  __unused kauth_cred_t cred, __unused int flags, 
-                  __unused struct proc *p)
-{
-       return(ENOTSUP);
-}
+       PSEM_SUBSYS_LOCK();
+       if ((pinfo = pnode->pinfo) == PSEMINFO_NULL) {
+               PSEM_SUBSYS_UNLOCK();
+               return EINVAL;
+       }

 
 

-static int
-psem_ioctl(__unused struct fileproc *fp, __unused u_long com, 
-                       __unused caddr_t data, __unused struct proc *p)
-{
-       return(ENOTSUP);
-}
+#if 0
+       if ((pinfo->psem_flags & PSEM_ALLOCATED) != PSEM_ALLOCATED) {
+               PSEM_SUBSYS_UNLOCK();
+               return EINVAL;
+       }
+#endif

 
 

-static int
-psem_select(__unused struct fileproc *fp, __unused int which, 
-                       __unused void *wql, __unused struct proc *p)
-{
-       return(ENOTSUP);
+       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;

 }
 
 }
 

-static int
-psem_kqfilter(__unused struct fileproc *fp, __unused struct knote *kn, 
-                               __unused struct proc *p)
+#if CONFIG_MACF
+void
+psem_label_associate(struct fileproc *fp, struct vnode *vp, vfs_context_t ctx)

 {
 {

-       return (ENOTSUP);
-}
+       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