]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/kern/kern_proc.c
xnu-3789.41.3.tar.gz
[apple/xnu.git] / bsd / kern / kern_proc.c
index 9dd8f6ad1924023db5cec9baac204c341febc7bc..3621eeaff01855972c07bf2ec93132d2f1f82a59 100644 (file)
@@ -83,7 +83,6 @@
 #include <sys/acct.h>
 #include <sys/wait.h>
 #include <sys/file_internal.h>
-#include <ufs/ufs/quota.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/lock.h>
 #include <sys/kauth.h>
 #include <sys/codesign.h>
 #include <sys/kernel_types.h>
+#include <sys/ubc.h>
 #include <kern/kalloc.h>
 #include <kern/task.h>
+#include <kern/coalition.h>
+#include <sys/coalition.h>
 #include <kern/assert.h>
 #include <vm/vm_protos.h>
+#include <vm/vm_map.h>         /* vm_map_switch_protect() */
+#include <vm/vm_pageout.h>
+#include <mach/task.h>
+#include <mach/message.h>
+#include <sys/priv.h>
+#include <sys/proc_info.h>
+#include <sys/bsdtask_info.h>
+#include <sys/persona.h>
+
+#if CONFIG_MEMORYSTATUS
+#include <sys/kern_memorystatus.h>
+#endif
 
 #if CONFIG_MACF
 #include <security/mac_framework.h>
@@ -134,45 +148,37 @@ struct proclist allproc;
 struct proclist zombproc;
 extern struct tty cons;
 
-#if CONFIG_LCTX
-/*
- * Login Context
- */
-static pid_t   lastlcid = 1;
-static int     alllctx_cnt;
-
-#define        LCID_MAX        8192    /* Does this really need to be large? */
-static int     maxlcid = LCID_MAX;
-
-LIST_HEAD(lctxlist, lctx);
-static struct lctxlist alllctx;
-
-lck_mtx_t alllctx_lock;
-lck_grp_t * lctx_lck_grp;
-lck_grp_attr_t * lctx_lck_grp_attr;
-lck_attr_t * lctx_lck_attr;
-
-static void    lctxinit(void);
-#endif
+extern int cs_debug;
 
 #if DEBUG
 #define __PROC_INTERNAL_DEBUG 1
 #endif
+#if CONFIG_COREDUMP
 /* Name to give to core files */
-__private_extern__ char corefilename[MAXPATHLEN+1] = {"/cores/core.%P"};
+__XNU_PRIVATE_EXTERN char corefilename[MAXPATHLEN+1] = {"/cores/core.%P"};
+#endif
+
+#if PROC_REF_DEBUG
+#include <kern/backtrace.h>
+#endif
+
+static void orphanpg(struct pgrp * pg);
+void proc_name_kdp(task_t t, char * buf, int size);
+void * proc_get_uthread_uu_threadlist(void * uthread_v);
+int proc_threadname_kdp(void * uth, char * buf, size_t size);
+void proc_starttime_kdp(void * p, uint64_t * tv_sec, uint64_t * tv_usec, uint64_t * abstime);
+char * proc_name_address(void * p);
 
-static void orphanpg(struct pgrp *pg);
-void   proc_name_kdp(task_t t, char * buf, int size);
-char   *proc_name_address(void *p);
+/* TODO: make a header that's exported and usable in osfmk */
+char* proc_best_name(proc_t p);
 
-static proc_t proc_refinternal_locked(proc_t p);
 static void  pgrp_add(struct pgrp * pgrp, proc_t parent, proc_t child);
 static void pgrp_remove(proc_t p);
 static void pgrp_replace(proc_t p, struct pgrp *pgrp);
 static void pgdelete_dropref(struct pgrp *pgrp);
-static proc_t proc_find_zombref(int pid);
-static void proc_drop_zombref(proc_t p);
 extern void pg_rele_dropref(struct pgrp * pgrp);
+static int csops_internal(pid_t pid, int ops, user_addr_t uaddr, user_size_t usersize, user_addr_t uaddittoken);
+static boolean_t proc_parent_is_currentproc(proc_t p);
 
 struct fixjob_iterargs {
        struct pgrp * pg;
@@ -182,6 +188,20 @@ struct fixjob_iterargs {
 
 int fixjob_callback(proc_t, void *);
 
+uint64_t get_current_unique_pid(void);
+
+
+uint64_t
+get_current_unique_pid(void)
+{
+       proc_t  p = current_proc();
+
+       if (p)
+               return p->p_uniqueid;
+       else
+               return 0;
+}
+
 /*
  * Initialize global process hashing structures.
  */
@@ -194,8 +214,8 @@ procinit(void)
        pgrphashtbl = hashinit(maxproc / 4, M_PROC, &pgrphash);
        sesshashtbl = hashinit(maxproc / 4, M_PROC, &sesshash);
        uihashtbl = hashinit(maxproc / 16, M_PROC, &uihash);
-#if CONFIG_LCTX
-       lctxinit();
+#if CONFIG_PERSONAS
+       personas_bootstrap();
 #endif
 }
 
@@ -342,7 +362,7 @@ proc_findinternal(int pid, int locked)
        }
 
        p = pfind_locked(pid);
-       if ((p == PROC_NULL) || (p != proc_refinternal_locked(p)))
+       if ((p == PROC_NULL) || (p != proc_ref_locked(p)))
                p = PROC_NULL;
 
        if (locked == 0) {
@@ -352,6 +372,73 @@ proc_findinternal(int pid, int locked)
        return(p);
 }
 
+proc_t
+proc_findthread(thread_t thread)
+{
+       proc_t p = PROC_NULL;
+       struct uthread *uth;
+
+       proc_list_lock();
+       uth = get_bsdthread_info(thread);
+       if (uth && (uth->uu_flag & UT_VFORK))
+               p = uth->uu_proc;
+       else
+               p = (proc_t)(get_bsdthreadtask_info(thread));
+       p = proc_ref_locked(p);
+       proc_list_unlock();
+       return(p);
+}
+
+#if PROC_REF_DEBUG
+void
+uthread_reset_proc_refcount(void *uthread) {
+       uthread_t uth;
+
+       if (proc_ref_tracking_disabled) {
+               return;
+       }
+
+       uth = (uthread_t) uthread;
+
+       uth->uu_proc_refcount = 0;
+       uth->uu_pindex = 0;
+}
+
+int
+uthread_get_proc_refcount(void *uthread) {
+       uthread_t uth;
+
+       if (proc_ref_tracking_disabled) {
+               return 0;
+       }
+
+       uth = (uthread_t) uthread;
+
+       return uth->uu_proc_refcount;
+}
+
+static void
+record_procref(proc_t p, int count) {
+       uthread_t uth;
+
+       if (proc_ref_tracking_disabled) {
+               return;
+       }
+
+       uth = current_uthread();
+       uth->uu_proc_refcount += count;
+
+       if (count == 1) {
+               if (uth->uu_pindex < NUM_PROC_REFS_TO_TRACK) {
+                       backtrace((uintptr_t *) &uth->uu_proc_pcs[uth->uu_pindex], PROC_REF_STACK_DEPTH);
+
+                       uth->uu_proc_ps[uth->uu_pindex] = p;
+                       uth->uu_pindex++;
+               }
+       }
+}
+#endif
+
 int 
 proc_rele(proc_t p)
 {
@@ -370,24 +457,42 @@ proc_self(void)
        p = current_proc();
 
        proc_list_lock();
-       if (p != proc_refinternal_locked(p))
+       if (p != proc_ref_locked(p))
                p = PROC_NULL;
        proc_list_unlock();
        return(p);
 }
 
 
-static proc_t
-proc_refinternal_locked(proc_t p)
+proc_t
+proc_ref_locked(proc_t p)
 {
        proc_t p1 = p;
        
        /* if process still in creation return failure */
        if ((p == PROC_NULL) || ((p->p_listflag & P_LIST_INCREATE) != 0))
                        return (PROC_NULL);
-       /* do not return process marked for termination */
-       if ((p->p_stat != SZOMB) && ((p->p_listflag & P_LIST_EXITED) == 0) && ((p->p_listflag & (P_LIST_DRAINWAIT | P_LIST_DRAIN | P_LIST_DEAD)) == 0))
+retry:
+       /*
+        * Do not return process marked for termination
+        * or proc_refdrain called without ref wait.
+        * Wait for proc_refdrain_with_refwait to complete if
+        * process in refdrain and refwait flag is set.
+        */
+       if ((p->p_stat != SZOMB) &&
+           ((p->p_listflag & P_LIST_EXITED) == 0) &&
+           ((p->p_listflag & P_LIST_DEAD) == 0) &&
+           (((p->p_listflag & (P_LIST_DRAIN | P_LIST_DRAINWAIT)) == 0) ||
+            ((p->p_listflag & P_LIST_REFWAIT) != 0))) {
+               if ((p->p_listflag & P_LIST_REFWAIT) != 0) {
+                       msleep(&p->p_listflag, proc_list_mlock, 0, "proc_refwait", 0) ;
+                       goto retry;
+               }
                p->p_refcount++;
+#if PROC_REF_DEBUG
+               record_procref(p, 1);
+#endif
+       }
        else 
                p1 = PROC_NULL;
 
@@ -400,6 +505,9 @@ proc_rele_locked(proc_t p)
 
        if (p->p_refcount > 0) {
                p->p_refcount--;
+#if PROC_REF_DEBUG
+               record_procref(p, -1);
+#endif
                if ((p->p_refcount == 0) && ((p->p_listflag & P_LIST_DRAINWAIT) == P_LIST_DRAINWAIT)) {
                        p->p_listflag &= ~P_LIST_DRAINWAIT;
                        wakeup(&p->p_refcount);
@@ -409,35 +517,38 @@ proc_rele_locked(proc_t p)
 
 }
 
-static proc_t
+proc_t
 proc_find_zombref(int pid)
 {
-       proc_t p1 = PROC_NULL;
-       proc_t p = PROC_NULL;
+       proc_t p;
 
        proc_list_lock();
 
+ again:
        p = pfind_locked(pid);
 
-       /* if process still in creation return NULL */
-       if ((p == PROC_NULL) || ((p->p_listflag & P_LIST_INCREATE) != 0)) {
+       /* should we bail? */
+       if ((p == PROC_NULL)                                    /* not found */
+           || ((p->p_listflag & P_LIST_INCREATE) != 0)         /* not created yet */
+           || ((p->p_listflag & P_LIST_EXITED) == 0)) {        /* not started exit */
+
                proc_list_unlock();
-               return (p1);
+               return (PROC_NULL);
        }
 
-       /* if process has not started exit or  is being reaped, return NULL */
-       if (((p->p_listflag & P_LIST_EXITED) != 0) && ((p->p_listflag & P_LIST_WAITING) == 0)) {
-               p->p_listflag |=  P_LIST_WAITING;
-               p1 = p;
-       } else 
-               p1 = PROC_NULL;
+       /* If someone else is controlling the (unreaped) zombie - wait */
+       if ((p->p_listflag & P_LIST_WAITING) != 0) {
+               (void)msleep(&p->p_stat, proc_list_mlock, PWAIT, "waitcoll", 0);
+               goto again;
+       }
+       p->p_listflag |=  P_LIST_WAITING;
 
        proc_list_unlock();
 
-       return(p1);
+       return(p);
 }
 
-static void
+void
 proc_drop_zombref(proc_t p)
 {
        proc_list_lock();
@@ -452,20 +563,59 @@ proc_drop_zombref(proc_t p)
 void
 proc_refdrain(proc_t p)
 {
+       proc_refdrain_with_refwait(p, FALSE);
+}
 
+proc_t
+proc_refdrain_with_refwait(proc_t p, boolean_t get_ref_and_allow_wait)
+{
+       boolean_t initexec = FALSE;
        proc_list_lock();
 
        p->p_listflag |= P_LIST_DRAIN;
-       while (p->p_refcount) {
+       if (get_ref_and_allow_wait) {
+               /*
+                * All the calls to proc_ref_locked will wait
+                * for the flag to get cleared before returning a ref.
+                */
+               p->p_listflag |= P_LIST_REFWAIT;
+               if (p == initproc) {
+                       initexec = TRUE;
+               }
+       }
+
+       /* Do not wait in ref drain for launchd exec */
+       while (p->p_refcount && !initexec) {
                p->p_listflag |= P_LIST_DRAINWAIT;
                msleep(&p->p_refcount, proc_list_mlock, 0, "proc_refdrain", 0) ;
        }
+
        p->p_listflag &= ~P_LIST_DRAIN;
-       p->p_listflag |= P_LIST_DEAD;
+       if (!get_ref_and_allow_wait) {
+               p->p_listflag |= P_LIST_DEAD;
+       } else {
+               /* Return a ref to the caller */
+               p->p_refcount++;
+#if PROC_REF_DEBUG
+               record_procref(p, 1);
+#endif
+       }
 
        proc_list_unlock();
 
+       if (get_ref_and_allow_wait) {
+               return (p);
+       }
+       return NULL;
+}
 
+void
+proc_refwake(proc_t p)
+{
+       proc_list_lock();
+       p->p_listflag &= ~P_LIST_REFWAIT;
+       wakeup(&p->p_listflag);
+       proc_list_unlock();
 }
 
 proc_t 
@@ -560,41 +710,87 @@ proc_checkdeadrefs(__unused proc_t p)
 {
 #if __PROC_INTERNAL_DEBUG
        if ((p->p_listflag  & P_LIST_INHASH) != 0)
-               panic("proc being freed and still in hash %x: %x\n", (unsigned int)p, (unsigned int)p->p_listflag);
+               panic("proc being freed and still in hash %p: %u\n", p, p->p_listflag);
        if (p->p_childrencnt != 0)
-               panic("proc being freed and pending children cnt %x:%x\n", (unsigned int)p, (unsigned int)p->p_childrencnt);
+               panic("proc being freed and pending children cnt %p:%d\n", p, p->p_childrencnt);
        if (p->p_refcount != 0)
-               panic("proc being freed and pending refcount %x:%x\n", (unsigned int)p, (unsigned int)p->p_refcount);
+               panic("proc being freed and pending refcount %p:%d\n", p, p->p_refcount);
        if (p->p_parentref != 0)
-               panic("proc being freed and pending parentrefs %x:%x\n", (unsigned int)p, (unsigned int)p->p_parentref);
+               panic("proc being freed and pending parentrefs %p:%d\n", p, p->p_parentref);
 #endif
 }
 
 int
 proc_pid(proc_t p)
 {
-       return(p->p_pid);
+       if (p != NULL)
+               return (p->p_pid);
+       return -1;
 }
 
-int 
+int
 proc_ppid(proc_t p)
 {
-               return(p->p_ppid);
+       if (p != NULL)
+               return (p->p_ppid);
+       return -1;
 }
 
-int 
+int
 proc_selfpid(void)
 {
-       proc_t p = current_proc();
-       return(p->p_pid);
+       return (current_proc()->p_pid);
 }
 
-int 
+int
 proc_selfppid(void)
 {
-       proc_t p = current_proc();
-       return(p->p_ppid);
+       return (current_proc()->p_ppid);
+}
+
+int
+proc_selfcsflags(void)
+{
+       return (current_proc()->p_csflags);
+}
+
+#if CONFIG_DTRACE
+static proc_t
+dtrace_current_proc_vforking(void)
+{
+       thread_t th = current_thread();
+       struct uthread *ut = get_bsdthread_info(th);
+
+       if (ut &&
+           ((ut->uu_flag & (UT_VFORK|UT_VFORKING)) == (UT_VFORK|UT_VFORKING))) {
+               /*
+                * Handle the narrow window where we're in the vfork syscall,
+                * but we're not quite ready to claim (in particular, to DTrace)
+                * that we're running as the child.
+                */
+               return (get_bsdtask_info(get_threadtask(th)));
+       }
+       return (current_proc());
+}
+
+int
+dtrace_proc_selfpid(void)
+{
+       return (dtrace_current_proc_vforking()->p_pid);
+}
+
+int 
+dtrace_proc_selfppid(void)
+{
+       return (dtrace_current_proc_vforking()->p_ppid);
+}
+
+uid_t
+dtrace_proc_selfruid(void)
+{
+       return (dtrace_current_proc_vforking()->p_ruid);
 }
+#endif /* CONFIG_DTRACE */
 
 proc_t 
 proc_parent(proc_t p)
@@ -605,7 +801,7 @@ proc_parent(proc_t p)
        proc_list_lock();
 loop:
        pp = p->p_pptr;
-       parent =  proc_refinternal_locked(pp);
+       parent =  proc_ref_locked(pp);
        if ((parent == PROC_NULL) && (pp != PROC_NULL) && (pp->p_stat != SZOMB) && ((pp->p_listflag & P_LIST_EXITED) != 0) && ((pp->p_listflag & P_LIST_CHILDDRAINED)== 0)){
                pp->p_listflag |= P_LIST_CHILDLKWAIT;
                msleep(&pp->p_childrencnt, proc_list_mlock, 0, "proc_parent", 0);
@@ -615,6 +811,18 @@ loop:
        return(parent);
 }
 
+static boolean_t
+proc_parent_is_currentproc(proc_t p)
+{
+       boolean_t ret = FALSE;
+       
+       proc_list_lock();
+       if (p->p_pptr == current_proc())
+               ret = TRUE;
+
+       proc_list_unlock();
+       return ret;
+}
 
 void
 proc_name(int pid, char * buf, int size)
@@ -631,9 +839,56 @@ void
 proc_name_kdp(task_t t, char * buf, int size)
 {
        proc_t p = get_bsdtask_info(t);
+       if (p == PROC_NULL)
+               return;
 
-       if (p != PROC_NULL)
-               strlcpy(buf, &p->p_comm[0], size);
+       if ((size_t)size > sizeof(p->p_comm))
+               strlcpy(buf, &p->p_name[0], MIN((int)sizeof(p->p_name), size));
+       else
+               strlcpy(buf, &p->p_comm[0], MIN((int)sizeof(p->p_comm), size));
+}
+
+int
+proc_threadname_kdp(void * uth, char * buf, size_t size)
+{
+       if (size < MAXTHREADNAMESIZE) {
+               /* this is really just a protective measure for the future in
+                * case the thread name size in stackshot gets out of sync with
+                * the BSD max thread name size. Note that bsd_getthreadname
+                * doesn't take input buffer size into account. */
+               return -1;
+       }
+
+       if (uth != NULL) {
+               bsd_getthreadname(uth, buf);
+       }
+       return 0;
+}
+
+/* note that this function is generally going to be called from stackshot,
+ * and the arguments will be coming from a struct which is declared packed
+ * thus the input arguments will in general be unaligned. We have to handle
+ * that here. */
+void
+proc_starttime_kdp(void *p, uint64_t *tv_sec, uint64_t *tv_usec, uint64_t *abstime)
+{
+       proc_t pp = (proc_t)p;
+       struct uint64p {
+               uint64_t val;
+       } __attribute__((packed));
+
+       if (pp != PROC_NULL) {
+               if (tv_sec != NULL)
+                       ((struct uint64p *)tv_sec)->val = pp->p_start.tv_sec;
+               if (tv_usec != NULL)
+                       ((struct uint64p *)tv_usec)->val = pp->p_start.tv_usec;
+               if (abstime != NULL) {
+                       if (pp->p_stats != NULL)
+                               *abstime = pp->p_stats->ps_start;
+                       else
+                               *abstime = 0;
+               }
+       }
 }
 
 char *
@@ -642,6 +897,14 @@ proc_name_address(void *p)
        return &((proc_t)p)->p_comm[0];
 }
 
+char *
+proc_best_name(proc_t p)
+{
+    if (p->p_name[0] != 0)
+        return (&p->p_name[0]);
+    return (&p->p_comm[0]);
+}
+
 void
 proc_selfname(char * buf, int  size)
 {
@@ -709,17 +972,6 @@ proc_forcequota(proc_t p)
 
 }
 
-int
-proc_tbe(proc_t p)
-{
-       int retval = 0;
-
-       if (p)
-               retval = p->p_flag & P_TBE;
-       return(retval? 1: 0);
-
-}
-
 int
 proc_suser(proc_t p)
 {
@@ -732,6 +984,12 @@ proc_suser(proc_t p)
        return(error);
 }
 
+task_t
+proc_task(proc_t proc)
+{
+       return (task_t)proc->task;
+}
+
 /*      
  * Obtain the first thread in a process
  *
@@ -757,6 +1015,15 @@ proc_ucred(proc_t p)
        return(p->p_ucred);
 }
 
+struct uthread *
+current_uthread()
+{
+       thread_t th = current_thread();
+
+       return((struct uthread *)get_bsdthread_info(th));
+}
+
+
 int
 proc_is64bit(proc_t p)
 {
@@ -769,24 +1036,100 @@ proc_pidversion(proc_t p)
        return(p->p_idversion);
 }
 
+uint32_t
+proc_persona_id(proc_t p)
+{
+       return (uint32_t)persona_id_from_proc(p);
+}
+
+uint32_t
+proc_getuid(proc_t p)
+{
+       return(p->p_uid);
+}
+
+uint32_t
+proc_getgid(proc_t p)
+{
+       return(p->p_gid);
+}
+
+uint64_t
+proc_uniqueid(proc_t p)
+{
+       return(p->p_uniqueid);
+}
+
+uint64_t
+proc_puniqueid(proc_t p)
+{
+       return(p->p_puniqueid);
+}
+
+void
+proc_coalitionids(__unused proc_t p, __unused uint64_t ids[COALITION_NUM_TYPES])
+{
+#if CONFIG_COALITIONS
+       task_coalition_ids(p->task, ids);
+#else
+       memset(ids, 0, sizeof(uint64_t [COALITION_NUM_TYPES]));
+#endif
+       return;
+}
+
+uint64_t
+proc_was_throttled(proc_t p)
+{
+       return (p->was_throttled);
+}
+
+uint64_t
+proc_did_throttle(proc_t p)
+{
+       return (p->did_throttle);
+}
+
 int
 proc_getcdhash(proc_t p, unsigned char *cdhash)
 {
        return vn_getcdhash(p->p_textvp, p->p_textoff, cdhash);
 }
 
+void
+proc_getexecutableuuid(proc_t p, unsigned char *uuidbuf, unsigned long size)
+{
+       if (size >= sizeof(p->p_uuid)) {
+               memcpy(uuidbuf, p->p_uuid, sizeof(p->p_uuid));
+       }
+}
+
+/* Return vnode for executable with an iocount. Must be released with vnode_put() */
+vnode_t
+proc_getexecutablevnode(proc_t p)
+{
+       vnode_t tvp  = p->p_textvp;
+
+       if ( tvp != NULLVP) {
+               if (vnode_getwithref(tvp) == 0) {
+                       return tvp;
+               }
+       }       
+
+       return NULLVP;
+}
+
+
 void
 bsd_set_dependency_capable(task_t task)
 {
     proc_t p = get_bsdtask_info(task);
 
     if (p) {
-       OSBitOrAtomic(P_DEPENDENCY_CAPABLE, (UInt32 *)&p->p_flag);
+       OSBitOrAtomic(P_DEPENDENCY_CAPABLE, &p->p_flag);
     }
 }
 
 
-/* LP64todo - figure out how to identify 64-bit processes if NULL procp */
 int
 IS_64BIT_PROCESS(proc_t p)
 {
@@ -803,7 +1146,7 @@ proc_t
 pfind_locked(pid_t pid)
 {
        proc_t p;
-#ifdef DEBUG
+#if DEBUG
        proc_t q;
 #endif
 
@@ -812,10 +1155,10 @@ pfind_locked(pid_t pid)
 
        for (p = PIDHASH(pid)->lh_first; p != 0; p = p->p_hash.le_next) {
                if (p->p_pid == pid) {
-#ifdef DEBUG
+#if DEBUG
                        for (q = p->p_hash.le_next; q != 0; q = q->p_hash.le_next) {
                                if ((p !=q) && (q->p_pid == pid))       
-                                       panic("two procs with same pid %x:%x:%d:%d\n", (unsigned int)p, (unsigned int)q, p->p_pid, q->p_pid);
+                                       panic("two procs with same pid %p:%p:%d:%d\n", p, q, p->p_pid, q->p_pid);
                        }
 #endif
                        return (p);
@@ -935,12 +1278,18 @@ pinsertchild(proc_t parent, proc_t child)
        TAILQ_INIT(&child->p_evlist);
        child->p_pptr = parent;
        child->p_ppid = parent->p_pid;
+       child->p_puniqueid = parent->p_uniqueid;
 
        pg = proc_pgrp(parent);
        pgrp_add(pg, parent, child);
        pg_rele(pg);
 
        proc_list_lock();
+       
+#if CONFIG_MEMORYSTATUS
+       memorystatus_add(child, TRUE);
+#endif
+       
        parent->p_childrencnt++;
        LIST_INSERT_HEAD(&parent->p_children, child, p_sibling);
 
@@ -949,7 +1298,6 @@ pinsertchild(proc_t parent, proc_t child)
        child->p_listflag &= ~P_LIST_INCREATE;
 
        proc_list_unlock();
-
 }
 
 /*
@@ -1014,14 +1362,18 @@ enterpgrp(proc_t p, pid_t pgid, int mksess)
                        sess->s_sid = p->p_pid;
                        sess->s_count = 1;
                        sess->s_ttyvp = NULL;
-                       sess->s_ttyp = NULL;
+                       sess->s_ttyp = TTY_NULL;
                        sess->s_flags = 0;
                        sess->s_listflags = 0;
                        sess->s_ttypgrpid = NO_PID;
+#if CONFIG_FINE_LOCK_GROUPS
+                       lck_mtx_init(&sess->s_mlock, proc_mlock_grp, proc_lck_attr);
+#else
                        lck_mtx_init(&sess->s_mlock, proc_lck_grp, proc_lck_attr);
+#endif
                        bcopy(procsp->s_login, sess->s_login,
                            sizeof(sess->s_login));
-                       OSBitAndAtomic(~((uint32_t)P_CONTROLT), (UInt32 *)&p->p_flag);
+                       OSBitAndAtomic(~((uint32_t)P_CONTROLT), &p->p_flag);
                        proc_list_lock();
                        LIST_INSERT_HEAD(SESSHASH(sess->s_sid), sess, s_hash);
                        proc_list_unlock();
@@ -1040,7 +1392,11 @@ enterpgrp(proc_t p, pid_t pgid, int mksess)
                        proc_list_unlock();
                }
                pgrp->pg_id = pgid;
+#if CONFIG_FINE_LOCK_GROUPS
+               lck_mtx_init(&pgrp->pg_mlock, proc_mlock_grp, proc_lck_attr);
+#else
                lck_mtx_init(&pgrp->pg_mlock, proc_lck_grp, proc_lck_attr);
+#endif
                LIST_INIT(&pgrp->pg_members);
                pgrp->pg_membercnt = 0;
                pgrp->pg_jobc = 0;
@@ -1093,8 +1449,7 @@ leavepgrp(proc_t p)
 static void
 pgdelete_dropref(struct pgrp *pgrp)
 {
-       struct tty * ttyp;
-       boolean_t fstate;
+       struct tty *ttyp;
        int emptypgrp  = 1;
        struct session *sessp;
 
@@ -1124,14 +1479,18 @@ pgdelete_dropref(struct pgrp *pgrp)
 
        proc_list_unlock();
        
-       fstate = thread_funnel_set(kernel_flock, TRUE);
-       
-       ttyp = pgrp->pg_session->s_ttyp;
-       if ((ttyp != NULL) && (pgrp->pg_session->s_ttyp->t_pgrp == pgrp)) {
-               pgrp->pg_session->s_ttyp->t_pgrp = NULL;
-               pgrp->pg_session->s_ttypgrpid = NO_PID;
+       ttyp = SESSION_TP(pgrp->pg_session);
+       if (ttyp != TTY_NULL) {
+               if (ttyp->t_pgrp == pgrp) {
+                       tty_lock(ttyp);
+                       /* Re-check after acquiring the lock */
+                       if (ttyp->t_pgrp == pgrp) {
+                               ttyp->t_pgrp = NULL;
+                               pgrp->pg_session->s_ttypgrpid = NO_PID;
+                       }
+                       tty_unlock(ttyp);
+               }
        }
-       (void) thread_funnel_set(kernel_flock, fstate);
 
        proc_list_lock();
 
@@ -1142,23 +1501,33 @@ pgdelete_dropref(struct pgrp *pgrp)
                if ((sessp->s_listflags & (S_LIST_TERM | S_LIST_DEAD)) != 0)
                        panic("pg_deleteref: terminating already terminated session");
                sessp->s_listflags |= S_LIST_TERM;
-               ttyp = sessp->s_ttyp;
+               ttyp = SESSION_TP(sessp);
                LIST_REMOVE(sessp, s_hash);
                proc_list_unlock();
-               fstate = thread_funnel_set(kernel_flock, TRUE);
-               if (ttyp != NULL && ttyp->t_session == sessp)
-                       ttyp->t_session = NULL;
-               (void) thread_funnel_set(kernel_flock, fstate);
+               if (ttyp != TTY_NULL) {
+                       tty_lock(ttyp);
+                       if (ttyp->t_session == sessp)
+                               ttyp->t_session = NULL;
+                       tty_unlock(ttyp);
+               }
                proc_list_lock();
                sessp->s_listflags |= S_LIST_DEAD;
                if (sessp->s_count != 0)
                        panic("pg_deleteref: freeing session in use");  
                proc_list_unlock();
+#if CONFIG_FINE_LOCK_GROUPS
+               lck_mtx_destroy(&sessp->s_mlock, proc_mlock_grp);
+#else
                lck_mtx_destroy(&sessp->s_mlock, proc_lck_grp);
+#endif
                FREE_ZONE(sessp, sizeof(struct session), M_SESSION);
        } else
                proc_list_unlock();
+#if CONFIG_FINE_LOCK_GROUPS
+       lck_mtx_destroy(&pgrp->pg_mlock, proc_mlock_grp);
+#else
        lck_mtx_destroy(&pgrp->pg_mlock, proc_lck_grp);
+#endif
        FREE_ZONE(pgrp, sizeof(*pgrp), M_PGRP);
 }
 
@@ -1217,12 +1586,24 @@ fixjobc(proc_t p, struct pgrp *pgrp, int entering)
        struct session *mysession = pgrp->pg_session;
        proc_t parent;
        struct fixjob_iterargs fjarg;
+       boolean_t proc_parent_self;
+
+       /*
+        * Check if p's parent is current proc, if yes then no need to take 
+        * a ref; calling proc_parent with current proc as parent may 
+        * deadlock if current proc is exiting.
+        */
+       proc_parent_self = proc_parent_is_currentproc(p);
+       if (proc_parent_self)
+               parent = current_proc();
+       else 
+               parent = proc_parent(p);
 
-       parent = proc_parent(p);
        if (parent != PROC_NULL) {
                hispgrp = proc_pgrp(parent);    
                hissess = proc_session(parent);
-               proc_rele(parent);
+               if (!proc_parent_self)
+                       proc_rele(parent);
        }
 
 
@@ -1259,85 +1640,102 @@ fixjobc(proc_t p, struct pgrp *pgrp, int entering)
        proc_childrenwalk(p, fixjob_callback, &fjarg);
 }
 
-/* 
- * A process group has become orphaned;
- * if there are any stopped processes in the group,
- * hang-up all process in that group.
+/*
+ * A process group has become orphaned; if there are any stopped processes in
+ * the group, hang-up all process in that group.
  */
 static void
-orphanpg(struct pgrp * pgrp)
+orphanpg(struct pgrp *pgrp)
 {
+       pid_t *pid_list;
        proc_t p;
-       pid_t * pid_list;
-       int count, pidcount, i, alloc_count;
+       vm_size_t pid_list_size = 0;
+       vm_size_t pid_list_size_needed = 0;
+       int pid_count = 0;
+       int pid_count_available = 0;
 
-       if (pgrp == PGRP_NULL)
-               return;
-       count = 0;
-       pgrp_lock(pgrp);
-       for (p = pgrp->pg_members.lh_first; p != 0; p = p->p_pglist.le_next) {
-               if (p->p_stat == SSTOP) {
-                       for (p = pgrp->pg_members.lh_first; p != 0;
-                               p = p->p_pglist.le_next) 
-                               count++;
-                       break;  /* ??? stops after finding one.. */
-               }
-       }
-       pgrp_unlock(pgrp);
+       assert(pgrp != NULL);
 
-       count += 20;
-       if (count > hard_maxproc)
-               count = hard_maxproc;
-       alloc_count = count * sizeof(pid_t);
-       pid_list = (pid_t *)kalloc(alloc_count);
-       bzero(pid_list, alloc_count);
-       
-       pidcount = 0;
-       pgrp_lock(pgrp);
-       for (p = pgrp->pg_members.lh_first; p != 0;
-            p = p->p_pglist.le_next) {
-               if (p->p_stat == SSTOP) {
-                       for (p = pgrp->pg_members.lh_first; p != 0;
-                               p = p->p_pglist.le_next) {
-                               pid_list[pidcount] = p->p_pid;
-                               pidcount++;
-                               if (pidcount >= count)
-                                       break;
+       /* allocate outside of the pgrp_lock */
+       for (;;) {
+               pgrp_lock(pgrp);
+
+               boolean_t should_iterate = FALSE;
+               pid_count_available = 0;
+
+               PGMEMBERS_FOREACH(pgrp, p) {
+                       pid_count_available++;
+
+                       if (p->p_stat == SSTOP) {
+                               should_iterate = TRUE;
                        }
-                       break; /* ??? stops after finding one.. */
                }
-       }
-       pgrp_unlock(pgrp);
-               
-       if (pidcount == 0)
-               goto out;
 
+               if (pid_count_available == 0 || !should_iterate) {
+                       pgrp_unlock(pgrp);
+                       return;
+               }
 
-       for (i = 0; i< pidcount; i++) {
-               /* No handling or proc0 */
-               if (pid_list[i] == 0)
-                       continue;
-               p = proc_find(pid_list[i]);
-               if (p) {
-                       proc_transwait(p, 0);
-                       pt_setrunnable(p);
-                       psignal(p, SIGHUP);
-                       psignal(p, SIGCONT);
-                       proc_rele(p);
+               pid_list_size_needed = pid_count_available * sizeof(pid_t);
+               if (pid_list_size >= pid_list_size_needed) {
+                       break;
                }
+               pgrp_unlock(pgrp);
+
+               if (pid_list_size != 0) {
+                       kfree(pid_list, pid_list_size);
+               }
+               pid_list = kalloc(pid_list_size_needed);
+               if (!pid_list) {
+                       return;
+               }
+               pid_list_size = pid_list_size_needed;
+       }
+
+       /* no orphaned processes */
+       if (pid_list_size == 0) {
+               pgrp_unlock(pgrp);
+               return;
+       }
+
+       PGMEMBERS_FOREACH(pgrp, p) {
+               pid_list[pid_count++] = proc_pid(p);
+               if (pid_count >= pid_count_available) {
+                       break;
+               }
+       }
+       pgrp_unlock(pgrp);
+
+       if (pid_count == 0) {
+               goto out;
+       }
+
+       for (int i = 0; i < pid_count; i++) {
+               /* do not handle kernproc */
+               if (pid_list[i] == 0) {
+                       continue;
+               }
+               p = proc_find(pid_list[i]);
+               if (!p) {
+                       continue;
+               }
+
+               proc_transwait(p, 0);
+               pt_setrunnable(p);
+               psignal(p, SIGHUP);
+               psignal(p, SIGCONT);
+               proc_rele(p);
        }
+
 out:
-       kfree(pid_list, alloc_count);
+       kfree(pid_list, pid_list_size);
        return;
 }
 
-
-
-/* XXX should be __private_extern__ */
 int
-proc_is_classic(proc_t p)
+proc_is_classic(proc_t p __unused)
 {
-    return (p->p_flag & P_TRANSLATED) ? 1 : 0;
+    return (0);
 }
 
 /* XXX Why does this function exist?  Need to kill it off... */
@@ -1347,6 +1745,13 @@ current_proc_EXTERNAL(void)
        return (current_proc());
 }
 
+int
+proc_is_forcing_hfs_case_sensitivity(proc_t p)
+{
+       return (p->p_vfs_iopolicy & P_VFS_IOPOLICY_FORCE_HFS_CASE_SENSITIVITY) ? 1 : 0;
+}
+
+#if CONFIG_COREDUMP
 /*
  * proc_core_name(name, uid, pid)
  * Expand the name described in corefilename, using name, uid, and pid.
@@ -1389,6 +1794,8 @@ proc_core_name(const char *name, uid_t uid, pid_t pid, char *cf_name,
                                snprintf(id_buf, sizeof(id_buf), "%u", uid);
                                appendstr = id_buf;
                                break;
+                       case '\0': /* format string ended in % symbol */
+                               goto endofstring;
                        default:
                                appendstr = "";
                                log(LOG_ERR,
@@ -1409,243 +1816,72 @@ proc_core_name(const char *name, uid_t uid, pid_t pid, char *cf_name,
                goto toolong;
        return (0);
 toolong:
-       log(LOG_ERR, "pid %ld (%s), uid (%lu): corename is too long\n",
-           (long)pid, name, (u_long)uid);
+       log(LOG_ERR, "pid %ld (%s), uid (%u): corename is too long\n",
+           (long)pid, name, (uint32_t)uid);
+       return (1);
+endofstring:
+       log(LOG_ERR, "pid %ld (%s), uid (%u): unexpected end of string after %% token\n",
+           (long)pid, name, (uint32_t)uid);
        return (1);
 }
+#endif /* CONFIG_COREDUMP */
 
-#if CONFIG_LCTX
-
-static void
-lctxinit(void)
-{
-       LIST_INIT(&alllctx);
-       alllctx_cnt = 0;
-
-       /* allocate lctx lock group attribute and group */
-       lctx_lck_grp_attr = lck_grp_attr_alloc_init();
-       lck_grp_attr_setstat(lctx_lck_grp_attr);
-
-       lctx_lck_grp = lck_grp_alloc_init("lctx", lctx_lck_grp_attr);
-       /* Allocate lctx lock attribute */
-       lctx_lck_attr = lck_attr_alloc_init();
-
-       lck_mtx_init(&alllctx_lock, lctx_lck_grp, lctx_lck_attr);
-}
-
-/*
- * Locate login context by number.
- */
-struct lctx *
-lcfind(pid_t lcid)
-{
-       struct lctx *l;
-
-       ALLLCTX_LOCK;
-       LIST_FOREACH(l, &alllctx, lc_list) {
-               if (l->lc_id == lcid) {
-                       LCTX_LOCK(l);
-                       break;
-               }
-       }
-       ALLLCTX_UNLOCK;
-       return (l);
-}
-
-#define        LCID_INC                                \
-       do {                                    \
-               lastlcid++;                     \
-               if (lastlcid > maxlcid) \
-                       lastlcid = 1;           \
-       } while (0)                             \
-
-struct lctx *
-lccreate(void)
-{
-       struct lctx *l;
-       pid_t newlcid;
-
-       /* Not very efficient but this isn't a common operation. */
-       while ((l = lcfind(lastlcid)) != NULL) {
-               LCTX_UNLOCK(l);
-               LCID_INC;
-       }
-       newlcid = lastlcid;
-       LCID_INC;
-
-       MALLOC(l, struct lctx *, sizeof(struct lctx), M_LCTX, M_WAITOK|M_ZERO);
-       l->lc_id = newlcid;
-       LIST_INIT(&l->lc_members);
-       lck_mtx_init(&l->lc_mtx, lctx_lck_grp, lctx_lck_attr);
-#if CONFIG_MACF
-       l->lc_label = mac_lctx_label_alloc();
-#endif
-       ALLLCTX_LOCK;
-       LIST_INSERT_HEAD(&alllctx, l, lc_list);
-       alllctx_cnt++;
-       ALLLCTX_UNLOCK;
-
-       return (l);
-}
+/* Code Signing related routines */
 
-/*
- * Call with proc protected (either by being invisible
- * or by having the all-login-context lock held) and
- * the lctx locked.
- *
- * Will unlock lctx on return.
- */
-void
-enterlctx (proc_t p, struct lctx *l, __unused int create)
+int 
+csops(__unused proc_t p, struct csops_args *uap, __unused int32_t *retval)
 {
-       if (l == NULL)
-               return;
-
-       p->p_lctx = l;
-       LIST_INSERT_HEAD(&l->lc_members, p, p_lclist);
-       l->lc_mc++;
-
-#if CONFIG_MACF
-       if (create)
-               mac_lctx_notify_create(p, l);
-       else
-               mac_lctx_notify_join(p, l);
-#endif
-       LCTX_UNLOCK(l);
-
-       return;
+       return(csops_internal(uap->pid, uap->ops, uap->useraddr, 
+               uap->usersize, USER_ADDR_NULL));
 }
 
-/*
- * Remove process from login context (if any). Called with p protected by
- * the alllctx lock.
- */
-void
-leavelctx (proc_t p)
+int 
+csops_audittoken(__unused proc_t p, struct csops_audittoken_args *uap, __unused int32_t *retval)
 {
-       struct lctx *l;
-
-       if (p->p_lctx == NULL) {
-               return;
-       }
-
-       LCTX_LOCK(p->p_lctx);
-       l = p->p_lctx;
-       p->p_lctx = NULL;
-       LIST_REMOVE(p, p_lclist);
-       l->lc_mc--;
-#if CONFIG_MACF
-       mac_lctx_notify_leave(p, l);
-#endif
-       if (LIST_EMPTY(&l->lc_members)) {
-               LIST_REMOVE(l, lc_list);
-               alllctx_cnt--;
-               LCTX_UNLOCK(l);
-               lck_mtx_destroy(&l->lc_mtx, lctx_lck_grp);
-#if CONFIG_MACF
-               mac_lctx_label_free(l->lc_label);
-               l->lc_label = NULL;
-#endif
-               FREE(l, M_LCTX);
-       } else {
-               LCTX_UNLOCK(l);
-       }
-       return;
+       if (uap->uaudittoken == USER_ADDR_NULL)
+               return(EINVAL);
+       return(csops_internal(uap->pid, uap->ops, uap->useraddr, 
+               uap->usersize, uap->uaudittoken));
 }
 
 static int
-sysctl_kern_lctx SYSCTL_HANDLER_ARGS
+csops_copy_token(void *start, size_t length, user_size_t usize, user_addr_t uaddr)
 {
-       int *name = (int*) arg1;
-       u_int namelen = arg2;
-       struct kinfo_lctx kil;
-       struct lctx *l;
+       char fakeheader[8] = { 0 };
        int error;
 
-       error = 0;
-
-       switch (oidp->oid_number) {
-       case KERN_LCTX_ALL:
-               ALLLCTX_LOCK;
-               /* Request for size. */
-               if (!req->oldptr) {
-                       error = SYSCTL_OUT(req, 0,
-                               sizeof(struct kinfo_lctx) * (alllctx_cnt + 1));
-                       goto out;
-               }
-               break;
-
-       case KERN_LCTX_LCID:
-               /* No space */
-               if (req->oldlen < sizeof(struct kinfo_lctx))
-                       return (ENOMEM);
-               /* No argument */
-               if (namelen != 1)
-                       return (EINVAL);
-               /* No login context */
-               l = lcfind((pid_t)name[0]);
-               if (l == NULL)
-                       return (ENOENT);
-               kil.id = l->lc_id;
-               kil.mc = l->lc_mc;
-               LCTX_UNLOCK(l);
-               return (SYSCTL_OUT(req, (caddr_t)&kil, sizeof(kil)));
-
-       default:
-               return (EINVAL);
-       }
-
-       /* Provided buffer is too small. */
-       if (req->oldlen < (sizeof(struct kinfo_lctx) * alllctx_cnt)) {
-               error = ENOMEM;
-               goto out;
-       }
-
-       LIST_FOREACH(l, &alllctx, lc_list) {
-               LCTX_LOCK(l);
-               kil.id = l->lc_id;
-               kil.mc = l->lc_mc;
-               LCTX_UNLOCK(l);
-               error = SYSCTL_OUT(req, (caddr_t)&kil, sizeof(kil));
-               if (error)
-                       break;
+       if (usize < sizeof(fakeheader))
+               return ERANGE;
+
+       /* if no blob, fill in zero header */
+       if (NULL == start) {
+               start = fakeheader;
+               length = sizeof(fakeheader);
+       } else if (usize < length) {
+               /* ... if input too short, copy out length of entitlement */
+               uint32_t length32 = htonl((uint32_t)length);
+               memcpy(&fakeheader[4], &length32, sizeof(length32));
+               
+               error = copyout(fakeheader, uaddr, sizeof(fakeheader));
+               if (error == 0)
+                       return ERANGE; /* input buffer to short, ERANGE signals that */
+               return error;
        }
-out:
-       ALLLCTX_UNLOCK;
-
-       return (error);
+       return copyout(start, uaddr, length);
 }
 
-SYSCTL_NODE(_kern, KERN_LCTX, lctx, CTLFLAG_RW|CTLFLAG_LOCKED, 0, "Login Context");
-
-SYSCTL_PROC(_kern_lctx, KERN_LCTX_ALL, all, CTLFLAG_RD|CTLTYPE_STRUCT,
-           0, 0, sysctl_kern_lctx, "S,lctx",
-           "Return entire login context table");
-SYSCTL_NODE(_kern_lctx, KERN_LCTX_LCID, lcid, CTLFLAG_RD,
-           sysctl_kern_lctx, "Login Context Table");
-SYSCTL_INT(_kern_lctx, OID_AUTO, last,  CTLFLAG_RD, &lastlcid, 0, ""); 
-SYSCTL_INT(_kern_lctx, OID_AUTO, count, CTLFLAG_RD, &alllctx_cnt, 0, "");
-SYSCTL_INT(_kern_lctx, OID_AUTO, max, CTLFLAG_RW, &maxlcid, 0, "");
-
-#endif /* LCTX */
-
-/* Code Signing related routines */
-
-int 
-csops(__unused proc_t p, struct csops_args *uap, __unused register_t *retval)
+static int
+csops_internal(pid_t pid, int ops, user_addr_t uaddr, user_size_t usersize, user_addr_t uaudittoken)
 {
-       int ops = uap->ops;
-       pid_t pid = uap->pid;
-       user_addr_t uaddr = uap->useraddr;
-       size_t usize = (size_t)CAST_DOWN(size_t, uap->usersize);
+       size_t usize = (size_t)CAST_DOWN(size_t, usersize);
        proc_t pt;
-       uint32_t retflags;
-       int vid, forself;
+       int forself;
        int error;
        vnode_t tvp;
        off_t toff;
-       char * buf;
        unsigned char cdhash[SHA1_RESULTLEN];
+       audit_token_t token;
+       unsigned int upid=0, uidversion = 0;
        
        forself = error = 0;
 
@@ -1655,37 +1891,86 @@ csops(__unused proc_t p, struct csops_args *uap, __unused register_t *retval)
                forself = 1;
 
 
-       /* Pre flight checks for CS_OPS_PIDPATH */
-       if (ops == CS_OPS_PIDPATH) {
-               /* usize is unsigned.. */
-               if (usize > 4 * PATH_MAX)
-                       return(EOVERFLOW);
-               if (kauth_cred_issuser(kauth_cred_get()) != TRUE) 
-                       return(EPERM);
-       } else if ((forself == 0) && ((ops != CS_OPS_STATUS) && (ops != CS_OPS_CDHASH) && (kauth_cred_issuser(kauth_cred_get()) != TRUE))) {
-               return(EPERM);
+       switch (ops) {
+               case CS_OPS_STATUS:
+               case CS_OPS_CDHASH:
+               case CS_OPS_PIDOFFSET:
+               case CS_OPS_ENTITLEMENTS_BLOB:
+               case CS_OPS_IDENTITY:
+               case CS_OPS_BLOB:
+                       break;  /* not restricted to root */
+               default:
+                       if (forself == 0 && kauth_cred_issuser(kauth_cred_get()) != TRUE)
+                               return(EPERM);
+                       break;
        }
 
        pt = proc_find(pid);
        if (pt == PROC_NULL)
                return(ESRCH);
 
+       upid = pt->p_pid;
+       uidversion = pt->p_idversion;
+       if (uaudittoken != USER_ADDR_NULL) {
+               
+               error = copyin(uaudittoken, &token, sizeof(audit_token_t));
+               if (error != 0)
+                       goto out;
+               /* verify the audit token pid/idversion matches with proc */
+               if ((token.val[5] != upid) || (token.val[7] != uidversion)) {
+                       error = ESRCH;
+                       goto out;
+               }
+       }
 
+#if CONFIG_MACF
+       switch (ops) {
+               case CS_OPS_MARKINVALID:
+               case CS_OPS_MARKHARD:
+               case CS_OPS_MARKKILL:
+               case CS_OPS_MARKRESTRICT:
+               case CS_OPS_SET_STATUS:
+               case CS_OPS_CLEARINSTALLER:
+                       if ((error = mac_proc_check_set_cs_info(current_proc(), pt, ops)))
+                               goto out;
+                       break;
+               default:
+                       if ((error = mac_proc_check_get_cs_info(current_proc(), pt, ops)))
+                               goto out;
+       }
+#endif
 
        switch (ops) {
 
-               case CS_OPS_STATUS:
+               case CS_OPS_STATUS: {
+                       uint32_t retflags;
+
+                       proc_lock(pt);
                        retflags = pt->p_csflags;
+                       if (cs_enforcement(pt))
+                               retflags |= CS_ENFORCEMENT;
+                       if (csproc_get_platform_binary(pt))
+                               retflags |= CS_PLATFORM_BINARY;
+                       if (csproc_get_platform_path(pt))
+                               retflags |= CS_PLATFORM_PATH;
+                       proc_unlock(pt);
+
                        if (uaddr != USER_ADDR_NULL)
                                error = copyout(&retflags, uaddr, sizeof(uint32_t));
                        break;
-               
+               }
                case CS_OPS_MARKINVALID:
                        proc_lock(pt);
                        if ((pt->p_csflags & CS_VALID) == CS_VALID) {   /* is currently valid */
                                pt->p_csflags &= ~CS_VALID;     /* set invalid */
                                if ((pt->p_csflags & CS_KILL) == CS_KILL) {
+                                       pt->p_csflags |= CS_KILLED;
                                        proc_unlock(pt);
+                                       if (cs_debug) {
+                                               printf("CODE SIGNING: marked invalid by pid %d: "
+                                               "p=%d[%s] honoring CS_KILL, final status 0x%x\n",
+                                               proc_selfpid(), pt->p_pid, pt->p_comm, pt->p_csflags);
+                                       }
                                        psignal(pt, SIGKILL);
                                } else
                                        proc_unlock(pt);
@@ -1716,40 +2001,23 @@ csops(__unused proc_t p, struct csops_args *uap, __unused register_t *retval)
                                proc_unlock(pt);
                        break;
 
-               case CS_OPS_PIDPATH:
-                       tvp = pt->p_textvp;
-                       vid = vnode_vid(tvp);
-
+               case CS_OPS_PIDOFFSET:
+                       toff = pt->p_textoff;
                        proc_rele(pt);
-
-                       buf = (char *)kalloc(usize);
-                       if (buf == NULL) 
-                               return(ENOMEM);
-                       bzero(buf, usize);
-
-                       error = vnode_getwithvid(tvp, vid);
-                       if (error == 0) {
-                               int len; 
-                               len = usize;
-                               error = vn_getpath(tvp, buf, &len);
-                               vnode_put(tvp);
-                               if (error == 0) {
-                                       error = copyout(buf, uaddr, usize);
-                               }
-                               kfree(buf, usize);
-                       }
+                       error = copyout(&toff, uaddr, sizeof(toff));
                        return(error);
 
                case CS_OPS_CDHASH:
-                       if (usize != SHA1_RESULTLEN) {
-                               proc_rele(pt);
-                               return EINVAL;
-                       }
 
                        /* pt already holds a reference on its p_textvp */
                        tvp = pt->p_textvp;
                        toff = pt->p_textoff;
 
+                       if (tvp == NULLVP || usize != SHA1_RESULTLEN) {
+                               proc_rele(pt);
+                               return EINVAL;
+                       }
+
                        error = vn_getcdhash(tvp, toff, cdhash);
                        proc_rele(pt);
 
@@ -1758,7 +2026,134 @@ csops(__unused proc_t p, struct csops_args *uap, __unused register_t *retval)
                        }
 
                        return error;
-               
+
+               case CS_OPS_ENTITLEMENTS_BLOB: {
+                       void *start;
+                       size_t length;
+
+                       proc_lock(pt);
+
+                       if ((pt->p_csflags & (CS_VALID | CS_DEBUGGED)) == 0) {
+                               proc_unlock(pt);
+                               error = EINVAL;
+                               break;
+                       }
+
+                       error = cs_entitlements_blob_get(pt, &start, &length);
+                       proc_unlock(pt);
+                       if (error)
+                               break;
+
+                       error = csops_copy_token(start, length, usize, uaddr);
+                       break;
+               }
+               case CS_OPS_MARKRESTRICT:
+                       proc_lock(pt);
+                       pt->p_csflags |= CS_RESTRICT;
+                       proc_unlock(pt);
+                       break;
+
+               case CS_OPS_SET_STATUS: {
+                       uint32_t flags;
+
+                       if (usize < sizeof(flags)) {
+                               error = ERANGE;
+                               break;
+                       }
+
+                       error = copyin(uaddr, &flags, sizeof(flags));
+                       if (error)
+                               break;
+
+                       /* only allow setting a subset of all code sign flags */
+                       flags &=
+                           CS_HARD | CS_EXEC_SET_HARD |
+                           CS_KILL | CS_EXEC_SET_KILL |
+                           CS_RESTRICT |
+                           CS_REQUIRE_LV |
+                           CS_ENFORCEMENT | CS_EXEC_SET_ENFORCEMENT;
+
+                       proc_lock(pt);
+                       if (pt->p_csflags & CS_VALID)
+                               pt->p_csflags |= flags;
+                       else
+                               error = EINVAL;
+                       proc_unlock(pt);
+
+                       break;
+               }
+               case CS_OPS_BLOB: {
+                       void *start;
+                       size_t length;
+
+                       proc_lock(pt);
+                       if ((pt->p_csflags & (CS_VALID | CS_DEBUGGED)) == 0) {
+                               proc_unlock(pt);
+                               error = EINVAL;
+                               break;
+                       }
+
+                       error = cs_blob_get(pt, &start, &length);
+                       proc_unlock(pt);
+                       if (error)
+                               break;
+
+                       error = csops_copy_token(start, length, usize, uaddr);
+                       break;
+               }
+               case CS_OPS_IDENTITY: {
+                       const char *identity;
+                       uint8_t fakeheader[8];
+                       uint32_t idlen;
+                       size_t length;
+
+                       /*
+                        * Make identity have a blob header to make it
+                        * easier on userland to guess the identity
+                        * length.
+                        */
+                       if (usize < sizeof(fakeheader)) {
+                           error = ERANGE;
+                           break;
+                       }
+                       memset(fakeheader, 0, sizeof(fakeheader));
+
+                       proc_lock(pt);
+                       if ((pt->p_csflags & (CS_VALID | CS_DEBUGGED)) == 0) {
+                               proc_unlock(pt);
+                               error = EINVAL;
+                               break;
+                       }
+
+                       identity = cs_identity_get(pt);
+                       proc_unlock(pt);
+                       if (identity == NULL) {
+                               error = ENOENT;
+                               break;
+                       }
+                       
+                       length = strlen(identity) + 1; /* include NUL */
+                       idlen = htonl(length + sizeof(fakeheader));
+                       memcpy(&fakeheader[4], &idlen, sizeof(idlen));
+
+                       error = copyout(fakeheader, uaddr, sizeof(fakeheader));
+                       if (error)
+                               break;
+
+                       if (usize < sizeof(fakeheader) + length)
+                               error = ERANGE;
+                       else if (usize > sizeof(fakeheader))
+                               error = copyout(identity, uaddr + sizeof(fakeheader), length);
+
+                       break;
+               }
+
+               case CS_OPS_CLEARINSTALLER:
+                       proc_lock(pt);
+                       pt->p_csflags &= ~(CS_INSTALLER | CS_EXEC_SET_INSTALLER);
+                       proc_unlock(pt);
+                       break;
+
                default:
                        error = EINVAL;
                        break;
@@ -1768,365 +2163,371 @@ out:
        return(error);
 }
 
-
 int
-proc_iterate(flags, callout, arg, filterfn, filterarg)
-       int flags;
-       int (*callout)(proc_t, void *);
-       void * arg;
-       int (*filterfn)(proc_t, void *);
-       void * filterarg;
-{
-       proc_t p;
-       pid_t * pid_list;
-       int count, pidcount, alloc_count, i, retval;
+proc_iterate(
+       unsigned int flags,
+       proc_iterate_fn_t callout,
+       void *arg,
+       proc_iterate_fn_t filterfn,
+       void *filterarg)
+{
+       pid_t *pid_list;
+       vm_size_t pid_list_size = 0;
+       vm_size_t pid_list_size_needed = 0;
+       int pid_count = 0;
+       int pid_count_available = 0;
+
+       assert(callout != NULL);
+
+       /* allocate outside of the proc_list_lock */
+       for (;;) {
+               proc_list_lock();
 
-       count = nprocs+ 10;
-       if (count > hard_maxproc)
-               count = hard_maxproc;
-       alloc_count = count * sizeof(pid_t);
-       pid_list = (pid_t *)kalloc(alloc_count);
-       bzero(pid_list, alloc_count);
+               pid_count_available = nprocs;
+               assert(pid_count_available > 0);
 
+               pid_list_size_needed = pid_count_available * sizeof(pid_t);
+               if (pid_list_size >= pid_list_size_needed) {
+                       break;
+               }
+               proc_list_unlock();
 
-       proc_list_lock();
+               if (pid_list_size != 0) {
+                       kfree(pid_list, pid_list_size);
+               }
+               pid_list = kalloc(pid_list_size_needed);
+               if (!pid_list) {
+                       return 1;
+               }
+               pid_list_size = pid_list_size_needed;
+       }
 
+       /* filter pids into pid_list */
 
-       pidcount = 0;
        if (flags & PROC_ALLPROCLIST) {
-               for (p = allproc.lh_first; (p != 0); p = p->p_list.le_next) {
-                       if (p->p_stat == SIDL)
+               proc_t p;
+               ALLPROC_FOREACH(p) {
+                       /* ignore processes that are being forked */
+                       if (p->p_stat == SIDL) {
+                               continue;
+                       }
+                       if ((filterfn != NULL) && (filterfn(p, filterarg) == 0)) {
                                continue;
-                       if ( (filterfn == 0 ) || (filterfn(p, filterarg) != 0)) {
-                               pid_list[pidcount] = p->p_pid;
-                               pidcount++;
-                               if (pidcount >= count)
-                                       break;
+                       }
+
+                       pid_list[pid_count++] = proc_pid(p);
+                       if (pid_count >= pid_count_available) {
+                               break;
                        }
                }
        }
-       if ((pidcount <  count ) && (flags & PROC_ZOMBPROCLIST)) {
-               for (p = zombproc.lh_first; p != 0; p = p->p_list.le_next) {
-                       if ( (filterfn == 0 ) || (filterfn(p, filterarg) != 0)) {
-                               pid_list[pidcount] = p->p_pid;
-                               pidcount++;
-                               if (pidcount >= count)
-                                       break;
+
+       if ((pid_count < pid_count_available) &&
+           (flags & PROC_ZOMBPROCLIST))
+       {
+               proc_t p;
+               ZOMBPROC_FOREACH(p) {
+                       if ((filterfn != NULL) && (filterfn(p, filterarg) == 0)) {
+                               continue;
+                       }
+
+                       pid_list[pid_count++] = proc_pid(p);
+                       if (pid_count >= pid_count_available) {
+                               break;
                        }
                }
        }
-               
 
        proc_list_unlock();
 
+       /* call callout on processes in the pid_list */
 
-       for (i = 0; i< pidcount; i++) {
-               p = proc_find(pid_list[i]);
+       for (int i = 0; i < pid_count; i++) {
+               proc_t p = proc_find(pid_list[i]);
                if (p) {
-                       if ((flags & PROC_NOWAITTRANS) == 0)
+                       if ((flags & PROC_NOWAITTRANS) == 0) {
                                proc_transwait(p, 0);
-                       retval = callout(p, arg);
-
-                       switch (retval) {
-                               case PROC_RETURNED:
-                               case PROC_RETURNED_DONE:
-                                       proc_rele(p);
-                                       if (retval == PROC_RETURNED_DONE) {
-                                               goto out;
-                                       }
-                                       break;
-
-                               case PROC_CLAIMED_DONE:
-                                       goto out;
-                               case PROC_CLAIMED:
-                               default:
-                                       break;
+                       }
+                       int callout_ret = callout(p, arg);
+
+                       switch (callout_ret) {
+                       case PROC_RETURNED_DONE:
+                               proc_rele(p);
+                               /* FALLTHROUGH */
+                       case PROC_CLAIMED_DONE:
+                               goto out;
+
+                       case PROC_RETURNED:
+                               proc_rele(p);
+                               /* FALLTHROUGH */
+                       case PROC_CLAIMED:
+                               break;
+
+                       default:
+                               panic("proc_iterate: callout returned %d for pid %d",
+                                     callout_ret, pid_list[i]);
+                               break;
                        }
                } else if (flags & PROC_ZOMBPROCLIST) {
                        p = proc_find_zombref(pid_list[i]);
-                       if (p != PROC_NULL) {
-                               retval = callout(p, arg);
-               
-                               switch (retval) {
-                                       case PROC_RETURNED:
-                                       case PROC_RETURNED_DONE:
-                                               proc_drop_zombref(p);
-                                               if (retval == PROC_RETURNED_DONE) {
-                                                       goto out;
-                                               }
-                                               break;
-
-                                       case PROC_CLAIMED_DONE:
-                                               goto out;
-                                       case PROC_CLAIMED:
-                                       default:
-                                               break;
-                               }
+                       if (!p) {
+                               continue;
+                       }
+                       int callout_ret = callout(p, arg);
+
+                       switch (callout_ret) {
+                       case PROC_RETURNED_DONE:
+                               proc_drop_zombref(p);
+                               /* FALLTHROUGH */
+                       case PROC_CLAIMED_DONE:
+                               goto out;
+
+                       case PROC_RETURNED:
+                               proc_drop_zombref(p);
+                               /* FALLTHROUGH */
+                       case PROC_CLAIMED:
+                               break;
+
+                       default:
+                               panic("proc_iterate: callout returned %d for zombie pid %d",
+                                       callout_ret, pid_list[i]);
+                               break;
                        }
                }
        }
 
-out: 
-       kfree(pid_list, alloc_count);
-       return(0);
+out:
+       kfree(pid_list, pid_list_size);
+       return 0;
 
 }
 
-
-#if 0
-/* This is for iteration in case of trivial non blocking callouts */
-int
-proc_scanall(flags, callout, arg)
-       int flags;
-       int (*callout)(proc_t, void *);
-       void * arg;
+void
+proc_rebootscan(
+       proc_iterate_fn_t callout,
+       void *arg,
+       proc_iterate_fn_t filterfn,
+       void *filterarg)
 {
        proc_t p;
-       int retval;
 
+       assert(callout != NULL);
 
-       proc_list_lock();
+       proc_shutdown_exitcount = 0;
 
+restart_foreach:
 
-       if (flags & PROC_ALLPROCLIST) {
-               for (p = allproc.lh_first; (p != 0); p = p->p_list.le_next) {
-                       retval = callout(p, arg);
-                       if (retval == PROC_RETURNED_DONE)
-                               goto out;
+       proc_list_lock();
+
+       ALLPROC_FOREACH(p) {
+               if ((filterfn != NULL) && filterfn(p, filterarg) == 0) {
+                       continue;
                }
-       }
-       if (flags & PROC_ZOMBPROCLIST) {
-               for (p = zombproc.lh_first; p != 0; p = p->p_list.le_next) {
-                       retval = callout(p, arg);
-                       if (retval == PROC_RETURNED_DONE)
-                               goto out;
+               p = proc_ref_locked(p);
+               if (!p) {
+                   continue;
                }
+
+               proc_list_unlock();
+
+               proc_transwait(p, 0);
+               (void)callout(p, arg);
+               proc_rele(p);
+
+               goto restart_foreach;
        }
-out:
 
        proc_list_unlock();
-
-       return(0);
 }
-#endif
-
 
 int
-proc_rebootscan(callout, arg, filterfn, filterarg)
-       int (*callout)(proc_t, void *);
-       void * arg;
-       int (*filterfn)(proc_t, void *);
-       void * filterarg;
+proc_childrenwalk(
+       proc_t parent,
+       proc_iterate_fn_t callout,
+       void *arg)
 {
-       proc_t p;
-       int lockheld = 0, retval;
-
-ps_allprocscan:
+       pid_t *pid_list;
+       vm_size_t pid_list_size = 0;
+       vm_size_t pid_list_size_needed = 0;
+       int pid_count = 0;
+       int pid_count_available = 0;
 
-       proc_list_lock();
-       lockheld = 1;
+       assert(parent != NULL);
+       assert(callout != NULL);
 
-       for (p = allproc.lh_first; (p != 0); p = p->p_list.le_next) {
-               if ( (filterfn == 0 ) || (filterfn(p, filterarg) != 0)) {
-                       p = proc_refinternal_locked(p);
+       for (;;) {
+               proc_list_lock();
 
+               pid_count_available = parent->p_childrencnt;
+               if (pid_count_available == 0) {
                        proc_list_unlock();
-                       lockheld = 0;
-
-                       if (p) {
-                               proc_transwait(p, 0);
-                               retval = callout(p, arg);
-                               proc_rele(p);
-       
-                               switch (retval) {
-                                       case PROC_RETURNED_DONE:
-                                       case PROC_CLAIMED_DONE:
-                                               goto out;
-                               }
-                       }
-                       goto ps_allprocscan;    
-               } /* filter pass */
-       } /* allproc walk thru */
+                       return 0;
+               }
 
-       if (lockheld == 1) {
+               pid_list_size_needed = pid_count_available * sizeof(pid_t);
+               if (pid_list_size >= pid_list_size_needed) {
+                       break;
+               }
                proc_list_unlock();
-               lockheld = 0;
-       }
 
-out: 
-       return(0);
-
-}
+               if (pid_list_size != 0) {
+                       kfree(pid_list, pid_list_size);
+               }
+               pid_list = kalloc(pid_list_size_needed);
+               if (!pid_list) {
+                       return 1;
+               }
+               pid_list_size = pid_list_size_needed;
+       }
 
+       proc_t p;
+       PCHILDREN_FOREACH(parent, p) {
+               if (p->p_stat == SIDL) {
+                       continue;
+               }
 
-int
-proc_childrenwalk(parent, callout, arg)
-       struct proc * parent;
-       int (*callout)(proc_t, void *);
-       void * arg;
-{
-       register struct proc *p;
-       pid_t * pid_list;
-       int count, pidcount, alloc_count, i, retval;
+               pid_list[pid_count++] = proc_pid(p);
+               if (pid_count >= pid_count_available) {
+                       break;
+               }
+       }
 
-       count = nprocs+ 10;
-       if (count > hard_maxproc)
-               count = hard_maxproc;
-       alloc_count = count * sizeof(pid_t);
-       pid_list = (pid_t *)kalloc(alloc_count);
-       bzero(pid_list, alloc_count);
+       proc_list_unlock();
 
+       for (int i = 0; i < pid_count; i++) {
+               p = proc_find(pid_list[i]);
+               if (!p) {
+                       continue;
+               }
 
-       proc_list_lock();
+               int callout_ret = callout(p, arg);
 
+               switch (callout_ret) {
+               case PROC_RETURNED_DONE:
+                       proc_rele(p);
+                       /* FALLTHROUGH */
+               case PROC_CLAIMED_DONE:
+                       goto out;
 
-       pidcount = 0;
-       for (p = parent->p_children.lh_first; (p != 0); p = p->p_sibling.le_next) {
-               if (p->p_stat == SIDL)
-                       continue;
-               pid_list[pidcount] = p->p_pid;
-               pidcount++;
-               if (pidcount >= count)
+               case PROC_RETURNED:
+                       proc_rele(p);
+                       /* FALLTHROUGH */
+               case PROC_CLAIMED:
+                       break;
+               default:
+                       panic("proc_childrenwalk: callout returned %d for pid %d",
+                             callout_ret, pid_list[i]);
                        break;
-       }
-       proc_list_unlock();
-
-
-       for (i = 0; i< pidcount; i++) {
-               p = proc_find(pid_list[i]);
-               if (p) {
-                       proc_transwait(p, 0);
-                       retval = callout(p, arg);
-
-                       switch (retval) {
-                               case PROC_RETURNED:
-                               case PROC_RETURNED_DONE:
-                                       proc_rele(p);
-                                       if (retval == PROC_RETURNED_DONE) {
-                                               goto out;
-                                       }
-                                       break;
-
-                               case PROC_CLAIMED_DONE:
-                                       goto out;
-                               case PROC_CLAIMED:
-                               default:
-                                       break;
-                       }
                }
        }
 
-out: 
-       kfree(pid_list, alloc_count);
-       return(0);
-
+out:
+       kfree(pid_list, pid_list_size);
+       return 0;
 }
 
-/*
- */
-/* PGRP_BLOCKITERATE is not implemented yet */
 int
-pgrp_iterate(pgrp, flags, callout, arg, filterfn, filterarg)
-       struct pgrp *pgrp;
-       int flags;
-       int (*callout)(proc_t, void *);
-       void * arg;
-       int (*filterfn)(proc_t, void *);
-       void * filterarg;
-{
+pgrp_iterate(
+       struct pgrp *pgrp,
+       unsigned int flags,
+       proc_iterate_fn_t callout,
+       void * arg,
+       proc_iterate_fn_t filterfn,
+       void * filterarg)
+{
+       pid_t *pid_list;
        proc_t p;
-       pid_t * pid_list;
-       int count, pidcount, i, alloc_count;
-       int retval;
+       vm_size_t pid_list_size = 0;
+       vm_size_t pid_list_size_needed = 0;
+       int pid_count = 0;
+       int pid_count_available = 0;
+
        pid_t pgid;
-       int dropref = flags & PGRP_DROPREF;
-#if 0
-       int serialize = flags & PGRP_BLOCKITERATE;
-#else
-       int serialize = 0;
-#endif
 
-       if (pgrp == 0)
-               return(0);
-       count = pgrp->pg_membercnt + 10;
-       if (count > hard_maxproc)
-               count = hard_maxproc;
-       alloc_count = count * sizeof(pid_t);
-       pid_list = (pid_t *)kalloc(alloc_count);
-       bzero(pid_list, alloc_count);
-       
-       pgrp_lock(pgrp);
-       if (serialize  != 0) {
-               while ((pgrp->pg_listflags & PGRP_FLAG_ITERABEGIN) == PGRP_FLAG_ITERABEGIN) {
-                       pgrp->pg_listflags |= PGRP_FLAG_ITERWAIT;
-                       msleep(&pgrp->pg_listflags, &pgrp->pg_mlock, 0, "pgrp_iterate", 0);
+       assert(pgrp != NULL);
+       assert(callout != NULL);
+
+       for (;;) {
+               pgrp_lock(pgrp);
+
+               pid_count_available = pgrp->pg_membercnt;
+               if (pid_count_available == 0) {
+                       pgrp_unlock(pgrp);
+                       return 0;
+               }
+
+               pid_list_size_needed = pid_count_available * sizeof(pid_t);
+               if (pid_list_size >= pid_list_size_needed) {
+                       break;
+               }
+               pgrp_unlock(pgrp);
+
+               if (pid_list_size != 0) {
+                       kfree(pid_list, pid_list_size);
+               }
+               pid_list = kalloc(pid_list_size_needed);
+               if (!pid_list) {
+                       return 1;
                }
-               pgrp->pg_listflags |= PGRP_FLAG_ITERABEGIN;
+               pid_list_size = pid_list_size_needed;
        }
 
        pgid = pgrp->pg_id;
 
-       pidcount = 0;
-       for (p = pgrp->pg_members.lh_first; p != 0;
-            p = p->p_pglist.le_next) {
-               if ( (filterfn == 0 ) || (filterfn(p, filterarg) != 0)) {
-                       pid_list[pidcount] = p->p_pid;
-                       pidcount++;
-                       if (pidcount >= count)
-                               break;
+       PGMEMBERS_FOREACH(pgrp, p) {
+               if ((filterfn != NULL) && (filterfn(p, filterarg) == 0)) {
+                       continue;;
+               }
+               pid_list[pid_count++] = proc_pid(p);
+               if (pid_count >= pid_count_available) {
+                       break;
                }
        }
-               
 
        pgrp_unlock(pgrp);
-       if ((serialize == 0) && (dropref != 0))
-               pg_rele(pgrp);
 
+       if (flags & PGRP_DROPREF) {
+               pg_rele(pgrp);
+       }
 
-       for (i = 0; i< pidcount; i++) {
-               /* No handling or proc0 */
-               if (pid_list[i] == 0)
+       for (int i = 0; i< pid_count; i++) {
+               /* do not handle kernproc */
+               if (pid_list[i] == 0) {
                        continue;
+               }
                p = proc_find(pid_list[i]);
-               if (p) {
-                       if (p->p_pgrpid != pgid) {
-                               proc_rele(p);
-                               continue;
-                       }
-                       proc_transwait(p, 0);
-                       retval = callout(p, arg);
-
-                       switch (retval) {
-                               case PROC_RETURNED:
-                               case PROC_RETURNED_DONE:
-                                       proc_rele(p);
-                                       if (retval == PROC_RETURNED_DONE) {
-                                               goto out;
-                                       }
-                                       break;
-
-                               case PROC_CLAIMED_DONE:
-                                       goto out;
-                               case PROC_CLAIMED:
-                               default:
-                                       break;
-                       }
+               if (!p) {
+                       continue;
                }
-       }
-out:
-       if (serialize != 0) {
-               pgrp_lock(pgrp);
-               pgrp->pg_listflags &= ~PGRP_FLAG_ITERABEGIN;
-               if ((pgrp->pg_listflags & PGRP_FLAG_ITERWAIT) == PGRP_FLAG_ITERWAIT) {
-                       pgrp->pg_listflags &= ~PGRP_FLAG_ITERWAIT;
-                       wakeup(&pgrp->pg_listflags);
+               if (p->p_pgrpid != pgid) {
+                       proc_rele(p);
+                       continue;
+               }
+
+               int callout_ret = callout(p, arg);
+
+               switch (callout_ret) {
+               case PROC_RETURNED:
+                       proc_rele(p);
+                       /* FALLTHROUGH */
+               case PROC_CLAIMED:
+                       break;
+
+               case PROC_RETURNED_DONE:
+                       proc_rele(p);
+                       /* FALLTHROUGH */
+               case PROC_CLAIMED_DONE:
+                       goto out;
+
+               default:
+                       panic("pgrp_iterate: callout returned %d for pid %d",
+                             callout_ret, pid_list[i]);
                }
-               pgrp_unlock(pgrp);
-               if (dropref != 0)
-                       pg_rele(pgrp);
        }
-       kfree(pid_list, alloc_count);
-       return(0);
+
+out:
+       kfree(pid_list, pid_list_size);
+       return 0;
 }
 
 static void
@@ -2189,7 +2590,7 @@ pgrp_remove(struct proc * p)
        pg->pg_membercnt--;
 
        if (pg->pg_membercnt < 0)
-               panic("pgprp: -ve membercnt pgprp:%x p:%x\n",(unsigned int)pg, (unsigned int)p);
+               panic("pgprp: -ve membercnt pgprp:%p p:%p\n",pg, p);
 
        LIST_REMOVE(p, p_pglist);
        if (pg->pg_members.lh_first == 0) {
@@ -2236,7 +2637,7 @@ pgrp_replace(struct proc * p, struct pgrp * newpg)
        pgrp_lock(oldpg);
        oldpg->pg_membercnt--;
        if (oldpg->pg_membercnt < 0)
-                panic("pgprp: -ve membercnt pgprp:%x p:%x\n",(unsigned int)oldpg, (unsigned int)p);
+                panic("pgprp: -ve membercnt pgprp:%p p:%p\n",oldpg, p);
        LIST_REMOVE(p, p_pglist);
         if (oldpg->pg_members.lh_first == 0) {
                 pgrp_unlock(oldpg);
@@ -2326,11 +2727,12 @@ proc_pgrp(proc_t p)
 
        assert(pgrp != NULL);
 
-       if ((pgrp->pg_listflags & (PGRP_FLAG_TERMINATE | PGRP_FLAG_DEAD)) != 0)
-               panic("proc_pgrp: ref being povided for dead pgrp");
-               
-       if (pgrp != PGRP_NULL) 
+       if (pgrp != PGRP_NULL) {
                pgrp->pg_refcount++;
+               if ((pgrp->pg_listflags & (PGRP_FLAG_TERMINATE | PGRP_FLAG_DEAD)) != 0)
+                       panic("proc_pgrp: ref being povided for dead pgrp");
+       }
+               
        proc_list_unlock();
        
        return(pgrp);
@@ -2392,18 +2794,27 @@ session_rele(struct session *sess)
                if (sess->s_count != 0)
                        panic("session_rele: freeing session in use");  
                proc_list_unlock();
+#if CONFIG_FINE_LOCK_GROUPS
+               lck_mtx_destroy(&sess->s_mlock, proc_mlock_grp);
+#else
                lck_mtx_destroy(&sess->s_mlock, proc_lck_grp);
+#endif
                FREE_ZONE(sess, sizeof(struct session), M_SESSION);
        } else
                proc_list_unlock();
 }
 
-void
-proc_transstart(proc_t p, int locked)
+int
+proc_transstart(proc_t p, int locked, int non_blocking)
 {
        if (locked == 0)
                proc_lock(p);
        while ((p->p_lflag & P_LINTRANSIT) == P_LINTRANSIT) {
+               if (((p->p_lflag & P_LTRANSCOMMIT) == P_LTRANSCOMMIT) || non_blocking) {
+                       if (locked == 0)
+                               proc_unlock(p);
+                       return EDEADLK;
+               }
                p->p_lflag |= P_LTRANSWAIT;
                msleep(&p->p_lflag, &p->p_mlock, 0, "proc_signstart", NULL);
        }
@@ -2411,37 +2822,61 @@ proc_transstart(proc_t p, int locked)
        p->p_transholder = current_thread();
        if (locked == 0)
                proc_unlock(p);
-
+       return 0;
 }
 
+void
+proc_transcommit(proc_t p, int locked)
+{
+       if (locked == 0)
+               proc_lock(p);
+
+       assert ((p->p_lflag & P_LINTRANSIT) == P_LINTRANSIT);
+       assert (p->p_transholder == current_thread());
+       p->p_lflag |= P_LTRANSCOMMIT;
+
+       if ((p->p_lflag & P_LTRANSWAIT) == P_LTRANSWAIT) {
+               p->p_lflag &= ~P_LTRANSWAIT;
+               wakeup(&p->p_lflag);
+       }
+       if (locked == 0)
+               proc_unlock(p);
+}
 
 void
 proc_transend(proc_t p, int locked)
 {
        if (locked == 0)
                proc_lock(p);
-       p->p_lflag &= ~P_LINTRANSIT;
+
+       p->p_lflag &= ~( P_LINTRANSIT | P_LTRANSCOMMIT);
+       p->p_transholder = NULL;
 
        if ((p->p_lflag & P_LTRANSWAIT) == P_LTRANSWAIT) {
                p->p_lflag &= ~P_LTRANSWAIT;
                wakeup(&p->p_lflag);
        }
-       p->p_transholder = NULL;
        if (locked == 0)
                proc_unlock(p);
 }
 
-void
+int
 proc_transwait(proc_t p, int locked)
 {
        if (locked == 0)
                proc_lock(p);
        while ((p->p_lflag & P_LINTRANSIT) == P_LINTRANSIT) {
+               if ((p->p_lflag & P_LTRANSCOMMIT) == P_LTRANSCOMMIT && current_proc() == p) {
+                       if (locked == 0)
+                               proc_unlock(p);
+                       return EDEADLK;
+               }
                p->p_lflag |= P_LTRANSWAIT;
                msleep(&p->p_lflag, &p->p_mlock, 0, "proc_signstart", NULL);
        }
        if (locked == 0)
                proc_unlock(p);
+       return 0;
 }
 
 void
@@ -2464,75 +2899,439 @@ proc_knote(struct proc * p, long hint)
        proc_klist_unlock();
 }
 
+void
+proc_knote_drain(struct proc *p)
+{
+       struct knote *kn = NULL;
+
+       /*
+        * Clear the proc's klist to avoid references after the proc is reaped.
+        */
+       proc_klist_lock();
+       while ((kn = SLIST_FIRST(&p->p_klist))) {
+               kn->kn_ptr.p_proc = PROC_NULL;
+               KNOTE_DETACH(&p->p_klist, kn);
+       }
+       proc_klist_unlock();
+}
+
+void 
+proc_setregister(proc_t p)
+{
+       proc_lock(p);
+       p->p_lflag |= P_LREGISTER;
+       proc_unlock(p);
+}
+
+void 
+proc_resetregister(proc_t p)
+{
+       proc_lock(p);
+       p->p_lflag &= ~P_LREGISTER;
+       proc_unlock(p);
+}
+
+pid_t
+proc_pgrpid(proc_t p)
+{
+       return p->p_pgrpid;
+}
+
+pid_t
+proc_selfpgrpid()
+{
+       return current_proc()->p_pgrpid;
+}
 
-unsigned long cs_procs_killed = 0;
-unsigned long cs_procs_invalidated = 0;
-int cs_force_kill = 0;
-int cs_force_hard = 0;
-int cs_debug = 0;
-SYSCTL_INT(_vm, OID_AUTO, cs_force_kill, CTLFLAG_RW, &cs_force_kill, 0, "");
-SYSCTL_INT(_vm, OID_AUTO, cs_force_hard, CTLFLAG_RW, &cs_force_hard, 0, "");
-SYSCTL_INT(_vm, OID_AUTO, cs_debug, CTLFLAG_RW, &cs_debug, 0, "");
 
+/* return control and action states */
 int
-cs_invalid_page(
-       addr64_t vaddr)
+proc_getpcontrol(int pid, int * pcontrolp)
 {
-       struct proc     *p;
-       int             retval;
+       proc_t p;
 
-       p = current_proc();
+       p = proc_find(pid);
+       if (p == PROC_NULL)
+               return(ESRCH);
+       if (pcontrolp != NULL)
+               *pcontrolp = p->p_pcaction;
 
-       /*
-        * XXX revisit locking when proc is no longer protected
-        * by the kernel funnel...
-        */
+       proc_rele(p);
+       return(0);
+}
+
+int
+proc_dopcontrol(proc_t p)
+{
+       int pcontrol;
 
-       /* XXX for testing */
        proc_lock(p);
-       if (cs_force_kill)
-               p->p_csflags |= CS_KILL;
-       if (cs_force_hard)
-               p->p_csflags |= CS_HARD;
 
-       /* CS_KILL triggers us to send a kill signal. Nothing else. */
-       if (p->p_csflags & CS_KILL) {
-               proc_unlock(p);
-               if (cs_debug) {
-                       printf("CODE SIGNING: cs_invalid_page(0x%llx): "
-                              "p=%d[%s] honoring CS_KILL\n",
-                              vaddr, p->p_pid, p->p_comm);
+       pcontrol = PROC_CONTROL_STATE(p);
+
+       if (PROC_ACTION_STATE(p) == 0) {
+               switch(pcontrol) {
+                       case P_PCTHROTTLE:
+                               PROC_SETACTION_STATE(p);
+                               proc_unlock(p);
+                               printf("low swap: throttling pid %d (%s)\n", p->p_pid, p->p_comm);
+                               break;
+
+                       case P_PCSUSP:
+                               PROC_SETACTION_STATE(p);
+                               proc_unlock(p);
+                               printf("low swap: suspending pid %d (%s)\n", p->p_pid, p->p_comm);
+                               task_suspend(p->task);
+                               break;
+
+                       case P_PCKILL:
+                               PROC_SETACTION_STATE(p);
+                               proc_unlock(p);
+                               printf("low swap: killing pid %d (%s)\n", p->p_pid, p->p_comm);
+                               psignal(p, SIGKILL);
+                               break;
+
+                       default:
+                               proc_unlock(p);
                }
-               cs_procs_killed++;
-               psignal(p, SIGKILL);
-               proc_lock(p);
-       }
+
+       } else 
+               proc_unlock(p);
+
+       return(PROC_RETURNED);
+}
+
+
+/*
+ * Resume a throttled or suspended process.  This is an internal interface that's only
+ * used by the user level code that presents the GUI when we run out of swap space and 
+ * hence is restricted to processes with superuser privileges.
+ */
+
+int
+proc_resetpcontrol(int pid)
+{
+       proc_t p;
+       int pcontrol;
+       int error;
+       proc_t self = current_proc();
+
+       /* if the process has been validated to handle resource control or root is valid one */
+       if (((self->p_lflag & P_LVMRSRCOWNER) == 0) && (error = suser(kauth_cred_get(), 0)))
+               return error;
+
+       p = proc_find(pid);
+       if (p == PROC_NULL)
+               return(ESRCH);
        
-       /* CS_HARD means fail the mapping operation so the process stays valid. */
-       if (p->p_csflags & CS_HARD) {
+       proc_lock(p);
+
+       pcontrol = PROC_CONTROL_STATE(p);
+
+       if(PROC_ACTION_STATE(p) !=0) {
+               switch(pcontrol) {
+                       case P_PCTHROTTLE:
+                               PROC_RESETACTION_STATE(p);
+                               proc_unlock(p);
+                               printf("low swap: unthrottling pid %d (%s)\n", p->p_pid, p->p_comm);
+                               break;
+
+                       case P_PCSUSP:
+                               PROC_RESETACTION_STATE(p);
+                               proc_unlock(p);
+                               printf("low swap: resuming pid %d (%s)\n", p->p_pid, p->p_comm);
+                               task_resume(p->task);
+                               break;
+
+                       case P_PCKILL:
+                               /* Huh? */
+                               PROC_SETACTION_STATE(p);
+                               proc_unlock(p);
+                               printf("low swap: attempt to unkill pid %d (%s) ignored\n", p->p_pid, p->p_comm);
+                               break;
+
+                       default:
+                               proc_unlock(p);
+               }
+
+       } else 
                proc_unlock(p);
-               if (cs_debug) {
-                       printf("CODE SIGNING: cs_invalid_page(0x%llx): "
-                              "p=%d[%s] honoring CS_HARD\n",
-                              vaddr, p->p_pid, p->p_comm);
+
+       proc_rele(p);
+       return(0);
+}
+
+
+
+struct no_paging_space
+{
+       uint64_t        pcs_max_size;
+       uint64_t        pcs_uniqueid;
+       int             pcs_pid;
+       int             pcs_proc_count;
+       uint64_t        pcs_total_size;
+
+       uint64_t        npcs_max_size;
+       uint64_t        npcs_uniqueid;
+       int             npcs_pid;
+       int             npcs_proc_count;
+       uint64_t        npcs_total_size;
+
+       int             apcs_proc_count;
+       uint64_t        apcs_total_size;
+};
+
+
+static int
+proc_pcontrol_filter(proc_t p, void *arg)
+{
+       struct no_paging_space *nps;
+       uint64_t        compressed;
+
+       nps = (struct no_paging_space *)arg;
+
+       compressed = get_task_compressed(p->task);
+
+       if (PROC_CONTROL_STATE(p)) {
+               if (PROC_ACTION_STATE(p) == 0) {
+                       if (compressed > nps->pcs_max_size) {
+                               nps->pcs_pid = p->p_pid;
+                               nps->pcs_uniqueid = p->p_uniqueid;
+                               nps->pcs_max_size = compressed;
+                       }
+                       nps->pcs_total_size += compressed;
+                       nps->pcs_proc_count++;
+               } else {
+                       nps->apcs_total_size += compressed;
+                       nps->apcs_proc_count++;
                }
-               retval = 1;
        } else {
-               if (p->p_csflags & CS_VALID) {
-                       p->p_csflags &= ~CS_VALID;
+               if (compressed > nps->npcs_max_size) {
+                       nps->npcs_pid = p->p_pid;
+                       nps->npcs_uniqueid = p->p_uniqueid;
+                       nps->npcs_max_size = compressed;
+               }
+               nps->npcs_total_size += compressed;
+               nps->npcs_proc_count++;
+
+       }
+       return (0);
+}
+
+
+static int
+proc_pcontrol_null(__unused proc_t p, __unused void *arg)
+{
+       return(PROC_RETURNED);
+}
+
+
+/*
+ * Deal with the low on compressor pool space condition... this function
+ * gets called when we are approaching the limits of the compressor pool or
+ * we are unable to create a new swap file.
+ * Since this eventually creates a memory deadlock situtation, we need to take action to free up
+ * memory resources (both compressed and uncompressed) in order to prevent the system from hanging completely.
+ * There are 2 categories of processes to deal with.  Those that have an action
+ * associated with them by the task itself and those that do not.  Actionable 
+ * tasks can have one of three categories specified:  ones that
+ * can be killed immediately, ones that should be suspended, and ones that should
+ * be throttled.  Processes that do not have an action associated with them are normally
+ * ignored unless they are utilizing such a large percentage of the compressor pool (currently 50%)
+ * that only by killing them can we hope to put the system back into a usable state.
+ */
+
+#define        NO_PAGING_SPACE_DEBUG   0
+
+extern uint64_t        vm_compressor_pages_compressed(void);
+
+struct timeval last_no_space_action = {0, 0};
+
+int
+no_paging_space_action()
+{
+       proc_t          p;
+       struct no_paging_space nps;
+       struct timeval  now;
+
+       /*
+        * Throttle how often we come through here.  Once every 5 seconds should be plenty.
+        */
+       microtime(&now);
+
+       if (now.tv_sec <= last_no_space_action.tv_sec + 5)
+               return (0);
+
+       /*
+        * Examine all processes and find the biggest (biggest is based on the number of pages this 
+        * task has in the compressor pool) that has been marked to have some action
+        * taken when swap space runs out... we also find the biggest that hasn't been marked for
+        * action.
+        *
+        * If the biggest non-actionable task is over the "dangerously big" threashold (currently 50% of
+        * the total number of pages held by the compressor, we go ahead and kill it since no other task
+        * can have any real effect on the situation.  Otherwise, we go after the actionable process.
+        */
+       bzero(&nps, sizeof(nps));
+
+       proc_iterate(PROC_ALLPROCLIST, proc_pcontrol_null, (void *)NULL, proc_pcontrol_filter, (void *)&nps);
+
+#if NO_PAGING_SPACE_DEBUG
+       printf("low swap: npcs_proc_count = %d, npcs_total_size = %qd, npcs_max_size = %qd\n",
+              nps.npcs_proc_count, nps.npcs_total_size, nps.npcs_max_size);
+       printf("low swap: pcs_proc_count = %d, pcs_total_size = %qd, pcs_max_size = %qd\n",
+              nps.pcs_proc_count, nps.pcs_total_size, nps.pcs_max_size);
+       printf("low swap: apcs_proc_count = %d, apcs_total_size = %qd\n",
+              nps.apcs_proc_count, nps.apcs_total_size);
+#endif
+       if (nps.npcs_max_size > (vm_compressor_pages_compressed() * 50) / 100) {
+               /*
+                * for now we'll knock out any task that has more then 50% of the pages
+                * held by the compressor
+                */
+               if ((p = proc_find(nps.npcs_pid)) != PROC_NULL) {
+       
+                       if (nps.npcs_uniqueid == p->p_uniqueid) {
+                               /*
+                                * verify this is still the same process
+                                * in case the proc exited and the pid got reused while
+                                * we were finishing the proc_iterate and getting to this point
+                                */
+                               last_no_space_action = now;
+
+                               printf("low swap: killing pid %d (%s)\n", p->p_pid, p->p_comm);
+                               psignal(p, SIGKILL);
                        
-                       proc_unlock(p);
-                       cs_procs_invalidated++;
-                       printf("CODE SIGNING: cs_invalid_page(0x%llx): "
-                              "p=%d[%s] clearing CS_VALID\n",
-                              vaddr, p->p_pid, p->p_comm);
-               } else {
-                       proc_unlock(p);
+                               proc_rele(p);
+
+                               return (0);
+                       }
+                               
+                       proc_rele(p);
                }
+       }
+
+       if (nps.pcs_max_size > 0) {
+               if ((p = proc_find(nps.pcs_pid)) != PROC_NULL) {
+
+                       if (nps.pcs_uniqueid == p->p_uniqueid) {
+                               /*
+                                * verify this is still the same process
+                                * in case the proc exited and the pid got reused while
+                                * we were finishing the proc_iterate and getting to this point
+                                */
+                               last_no_space_action = now;
                
-               retval = 0;
+                               proc_dopcontrol(p);
+                       
+                               proc_rele(p);
+                               
+                               return (1);
+                       }
+       
+                       proc_rele(p);
+               }
+       }
+       last_no_space_action = now;
+
+       printf("low swap: unable to find any eligible processes to take action on\n");
+
+       return (0);
+}
+
+int 
+proc_trace_log(__unused proc_t p,  struct proc_trace_log_args *uap, __unused int *retval)
+{
+       int ret = 0;
+       proc_t target_proc = PROC_NULL;
+       pid_t target_pid = uap->pid;
+       uint64_t target_uniqueid = uap->uniqueid;
+       task_t target_task = NULL;
+
+       if (priv_check_cred(kauth_cred_get(), PRIV_PROC_TRACE_INSPECT, 0)) {
+               ret = EPERM;
+               goto out;
+       }
+       target_proc = proc_find(target_pid);
+       if (target_proc != PROC_NULL) {
+               if (target_uniqueid != proc_uniqueid(target_proc)) {
+                       ret = ENOENT;
+                       goto out;
+               }
+
+               target_task = proc_task(target_proc);
+               if (task_send_trace_memory(target_task, target_pid, target_uniqueid)) {
+                       ret = EINVAL;
+                       goto out;
+               }
+       } else
+               ret = ENOENT;
+
+out:
+       if (target_proc != PROC_NULL)
+               proc_rele(target_proc);
+       return (ret);
+}
+
+#if VM_SCAN_FOR_SHADOW_CHAIN
+extern int vm_map_shadow_max(vm_map_t map);
+int proc_shadow_max(void);
+int proc_shadow_max(void)
+{
+       int             retval, max;
+       proc_t          p;
+       task_t          task;
+       vm_map_t        map;
+
+       max = 0;
+       proc_list_lock();
+       for (p = allproc.lh_first; (p != 0); p = p->p_list.le_next) {
+               if (p->p_stat == SIDL)
+                       continue;
+               task = p->task;
+               if (task == NULL) {
+                       continue;
+               }
+               map = get_task_map(task);
+               if (map == NULL) {
+                       continue;
+               }
+               retval = vm_map_shadow_max(map);
+               if (retval > max) {
+                       max = retval;
+               }
+       }
+       proc_list_unlock();
+       return max;
+}
+#endif /* VM_SCAN_FOR_SHADOW_CHAIN */
+
+void proc_set_responsible_pid(proc_t target_proc, pid_t responsible_pid);
+void proc_set_responsible_pid(proc_t target_proc, pid_t responsible_pid)
+{
+       if (target_proc != NULL) {
+               target_proc->p_responsible_pid = responsible_pid;
+       }
+       return;
+}
+
+int
+proc_chrooted(proc_t p)
+{
+       int retval = 0;
+
+       if (p) {
+               proc_fdlock(p);
+               retval = (p->p_fd->fd_rdir != NULL) ? 1 : 0;
+               proc_fdunlock(p);
        }
 
        return retval;
 }
 
+void *
+proc_get_uthread_uu_threadlist(void * uthread_v)
+{
+       uthread_t uth = (uthread_t)uthread_v;
+       return (uth != NULL) ? uth->uu_threadlist : NULL;
+}