]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/kern/kern_sysctl.c
xnu-1504.9.17.tar.gz
[apple/xnu.git] / bsd / kern / kern_sysctl.c
index 19eaed4ae69ddcf5c179ea30d798da15dc8a5e32..842a3e5720abbcca16c9ca4a9562fa15ae92f54d 100644 (file)
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*-
  *
  *     @(#)kern_sysctl.c       8.4 (Berkeley) 4/14/94
  */
+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */
 
 /*
- * sysctl system call.
+* DEPRECATED sysctl system call code
+ *
+ * Everything in this file is deprecated. Sysctls should be handled
+ * by the code in kern_newsysctl.c.
+ * The remaining "case" sections are supposed to be converted into
+ * SYSCTL_*-style definitions, and as soon as all of them are gone,
+ * this source file is supposed to die.
+ *
+ * DO NOT ADD ANY MORE "case" SECTIONS TO THIS FILE, instead define
+ * your sysctl with SYSCTL_INT, SYSCTL_PROC etc. in your source file.
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/file.h>
-#include <sys/vnode.h>
+#include <sys/proc_internal.h>
+#include <sys/kauth.h>
+#include <sys/file_internal.h>
+#include <sys/vnode_internal.h>
 #include <sys/unistd.h>
 #include <sys/buf.h>
 #include <sys/ioctl.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
 #include <sys/aio_kern.h>
+#include <sys/reboot.h>
+
+#include <security/audit/audit.h>
+#include <kern/kalloc.h>
+
 #include <mach/machine.h>
 #include <mach/mach_types.h>
 #include <mach/vm_param.h>
+#include <kern/mach_param.h>
 #include <kern/task.h>
+#include <kern/lock.h>
+#include <kern/debug.h>
 #include <vm/vm_kern.h>
+#include <vm/vm_map.h>
 #include <mach/host_info.h>
 
-extern vm_map_t bsd_pageable_map;
-
-#include <sys/mount.h>
+#include <sys/mount_internal.h>
 #include <sys/kdebug.h>
+#include <sys/sysproto.h>
 
 #include <IOKit/IOPlatformExpert.h>
 #include <pexpert/pexpert.h>
 
 #include <machine/machine_routines.h>
+#include <machine/exec.h>
+
+#include <vm/vm_protos.h>
+
+#if defined(__i386__) || defined(__x86_64__)
+#include <i386/cpuid.h>
+#endif
 
 sysctlfn kern_sysctl;
-#ifdef DEBUG
+#if DEBUG
 sysctlfn debug_sysctl;
 #endif
-extern sysctlfn vm_sysctl;
-extern sysctlfn vfs_sysctl;
 extern sysctlfn net_sysctl;
 extern sysctlfn cpu_sysctl;
 extern int aio_max_requests;                           
 extern int aio_max_requests_per_process;       
 extern int aio_worker_threads;                         
-extern int maxprocperuid;
-extern int maxfilesperproc;
-
+extern int lowpri_IO_window_msecs;
+extern int lowpri_IO_delay_msecs;
+extern int nx_enabled;
+extern int speculative_reads_disabled;
+extern unsigned int preheat_pages_max;
+extern unsigned int preheat_pages_min;
+extern unsigned int preheat_pages_mult;
+extern long numvnodes;
 
+static void
+fill_user32_eproc(proc_t p, struct user32_eproc *ep);
+static void
+fill_user32_externproc(proc_t p, struct user32_extern_proc *exp);
+static void
+fill_user64_eproc(proc_t p, struct user64_eproc *ep);
+static void
+fill_user64_proc(proc_t p, struct user64_kinfo_proc *kp);
+static void
+fill_user64_externproc(proc_t p, struct user64_extern_proc *exp);
+extern int 
+kdbg_control(int *name, u_int namelen, user_addr_t where, size_t * sizep);
 int
-userland_sysctl(struct proc *p, int *name, u_int namelen, void *old, size_t 
-               *oldlenp, int inkernel, void *new, size_t newlen, size_t *retval);
-
-static int
-sysctl_aiomax( void *oldp, size_t *oldlenp, void *newp, size_t newlen );
-static int
-sysctl_aioprocmax( void *oldp, size_t *oldlenp, void *newp, size_t newlen );
-static int
-sysctl_aiothreads( void *oldp, size_t *oldlenp, void *newp, size_t newlen );
+kdebug_ops(int *name, u_int namelen, user_addr_t where, size_t *sizep, proc_t p);
+#if NFSCLIENT
+extern int 
+netboot_root(void);
+#endif
+int
+pcsamples_ops(int *name, u_int namelen, user_addr_t where, size_t *sizep, 
+              proc_t p);
+__private_extern__ kern_return_t
+reset_vmobjectcache(unsigned int val1, unsigned int val2);
+int
+sysctl_doproc(int *name, u_int namelen, user_addr_t where, size_t *sizep);
+int 
+sysctl_doprof(int *name, u_int namelen, user_addr_t oldp, size_t *oldlenp, 
+                         user_addr_t newp, size_t newlen);
 static void
-fill_proc(struct proc *p, struct kinfo_proc *kp);
-static int
-sysctl_maxfilesperproc( void *oldp, size_t *oldlenp, void *newp, size_t newlen );
-static int
-sysctl_maxprocperuid( void *oldp, size_t *oldlenp, void *newp, size_t newlen );
-static int
-sysctl_maxproc( void *oldp, size_t *oldlenp, void *newp, size_t newlen );
+fill_user32_proc(proc_t p, struct user32_kinfo_proc *kp);
+int
+sysctl_procargs(int *name, u_int namelen, user_addr_t where, 
+                               size_t *sizep, proc_t cur_proc);
 static int
-sysctl_procargs2( int *name, u_int namelen, char *where, size_t *sizep, struct proc *cur_proc);
+sysctl_procargs2(int *name, u_int namelen, user_addr_t where, size_t *sizep, 
+                 proc_t cur_proc);
 static int
-sysctl_procargsx( int *name, u_int namelen, char *where, size_t *sizep, struct proc *cur_proc, int argc_yes);
+sysctl_procargsx(int *name, u_int namelen, user_addr_t where, size_t *sizep, 
+                 proc_t cur_proc, int argc_yes);
+int
+sysctl_struct(user_addr_t oldp, size_t *oldlenp, user_addr_t newp, 
+              size_t newlen, void *sp, int len);
+
+static int sysdoproc_filt_KERN_PROC_PID(proc_t p, void * arg);
+static int sysdoproc_filt_KERN_PROC_PGRP(proc_t p, void * arg);
+static int sysdoproc_filt_KERN_PROC_TTY(proc_t p, void * arg);
+static int  sysdoproc_filt_KERN_PROC_UID(proc_t p, void * arg);
+static int  sysdoproc_filt_KERN_PROC_RUID(proc_t p, void * arg);
+#if CONFIG_LCTX
+static int  sysdoproc_filt_KERN_PROC_LCID(proc_t p, void * arg);
+#endif
+int sysdoproc_callback(proc_t p, void *arg);
 
+static int __sysctl_funneled(proc_t p, struct __sysctl_args *uap, int32_t *retval);
 
-/*
- * temporary location for vm_sysctl.  This should be machine independant
- */
-int
-vm_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
-       int *name;
-       u_int namelen;
-       void *oldp;
-       size_t *oldlenp;
-       void *newp;
-       size_t newlen;
-       struct proc *p;
-{
-       extern uint32_t mach_factor[3];
-       struct loadavg loadinfo;
+extern void IORegistrySetOSBuildVersion(char * build_version); 
 
-       switch (name[0]) {
-       case VM_LOADAVG:
-               return (sysctl_struct(oldp, oldlenp, newp, newlen,
-                                       &averunnable, sizeof(struct loadavg)));
-       case VM_MACHFACTOR:
-               loadinfo.ldavg[0] = mach_factor[0];
-               loadinfo.ldavg[1] = mach_factor[1];
-               loadinfo.ldavg[2] = mach_factor[2];
-               loadinfo.fscale = LSCALE;
-               return (sysctl_struct(oldp, oldlenp, newp, newlen,
-                                       &loadinfo, sizeof(struct loadavg)));
-       case VM_METER:
-               return (EOPNOTSUPP);
-       case VM_MAXID:
-               return (EOPNOTSUPP);
-       default:
-               return (EOPNOTSUPP);
-       }
-       /* NOTREACHED */
-       return (EOPNOTSUPP);
+static void
+fill_loadavg64(struct loadavg *la, struct user64_loadavg *la64)
+{
+       la64->ldavg[0]  = la->ldavg[0];
+       la64->ldavg[1]  = la->ldavg[1];
+       la64->ldavg[2]  = la->ldavg[2];
+       la64->fscale    = (user64_long_t)la->fscale;
+}
+
+static void
+fill_loadavg32(struct loadavg *la, struct user32_loadavg *la32)
+{
+       la32->ldavg[0]  = la->ldavg[0];
+       la32->ldavg[1]  = la->ldavg[1];
+       la32->ldavg[2]  = la->ldavg[2];
+       la32->fscale    = (user32_long_t)la->fscale;
 }
 
 /*
  * Locking and stats
  */
-static struct sysctl_lock {
-       int     sl_lock;
-       int     sl_want;
-       int     sl_locked;
-} memlock;
-
-struct __sysctl_args {
-       int *name;
-       u_int namelen;
-       void *old;
-       size_t *oldlenp;
-       void *new;
-       size_t newlen;
-};
+static struct sysctl_lock memlock;
+
+/* sysctl() syscall */
 int
-__sysctl(p, uap, retval)
-       struct proc *p;
-       register struct __sysctl_args *uap;
-       register_t *retval;
+__sysctl(proc_t p, struct __sysctl_args *uap, int32_t *retval)
+{
+       boolean_t funnel_state;
+       int error;
+
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);
+       error = __sysctl_funneled(p, uap, retval);
+       thread_funnel_set(kernel_flock, funnel_state);
+       return(error);
+}
+
+static int
+__sysctl_funneled(proc_t p, struct __sysctl_args *uap, __unused int32_t *retval)
 {
        int error, dolock = 1;
-       size_t savelen, oldlen = 0;
-       sysctlfn *fn;
+       size_t savelen = 0, oldlen = 0, newlen;
+       sysctlfn *fnp = NULL;
        int name[CTL_MAXNAME];
-       int i;
        int error1;
+       boolean_t memlock_taken = FALSE;
+       boolean_t vslock_taken = FALSE;
+#if CONFIG_MACF
+       kauth_cred_t my_cred;
+#endif
 
        /*
         * all top-level sysctl names are non-terminal
         */
        if (uap->namelen > CTL_MAXNAME || uap->namelen < 2)
                return (EINVAL);
-       if (error =
-           copyin(uap->name, &name, uap->namelen * sizeof(int)))
+       error = copyin(uap->name, &name[0], uap->namelen * sizeof(int));
+       if (error)
                return (error);
+               
+       AUDIT_ARG(ctlname, name, uap->namelen);
 
+       if (proc_is64bit(p)) {
+               /* uap->newlen is a size_t value which grows to 64 bits 
+                * when coming from a 64-bit process.  since it's doubtful we'll 
+                * have a sysctl newp buffer greater than 4GB we shrink it to size_t
+                */
+               newlen = CAST_DOWN(size_t, uap->newlen);
+       }
+       else {
+               newlen = uap->newlen;
+       }
+       
        /* CTL_UNSPEC is used to get oid to AUTO_OID */
-       if (uap->new != NULL
-               && ((name[0] == CTL_KERN
-                               && !(name[1] == KERN_IPC || name[1] == KERN_PANICINFO))
-                       || (name[0] == CTL_HW)
-                       || (name[0] == CTL_VM)
-                       || (name[0] == CTL_VFS))
-               && (error = suser(p->p_ucred, &p->p_acflag)))
+       if (uap->new != USER_ADDR_NULL
+           && ((name[0] == CTL_KERN
+               && !(name[1] == KERN_IPC || name[1] == KERN_PANICINFO || name[1] == KERN_PROCDELAYTERM || 
+                    name[1] == KERN_PROCNAME || name[1] == KERN_RAGEVNODE || name[1] == KERN_CHECKOPENEVT || name[1] == KERN_THREADNAME))
+           || (name[0] == CTL_HW)
+           || (name[0] == CTL_VM))
+           && (error = suser(kauth_cred_get(), &p->p_acflag)))
                return (error);
 
+/* XXX: KERN, VFS and DEBUG are handled by their respective functions,
+ * but there is a fallback for all sysctls other than VFS to
+ * userland_sysctl() - KILL THIS! */
        switch (name[0]) {
        case CTL_KERN:
-               fn = kern_sysctl;
+               fnp = kern_sysctl;
                if ((name[1] != KERN_VNODE) && (name[1] != KERN_FILE) 
                        && (name[1] != KERN_PROC))
                        dolock = 0;
                break;
-       case CTL_VM:
-               fn = vm_sysctl;
-               break;
-                
        case CTL_VFS:
-               fn = vfs_sysctl;
+               fnp = vfs_sysctl;
                break;
-#ifdef DEBUG
+#if DEBUG
        case CTL_DEBUG:
-               fn = debug_sysctl;
+               fnp = debug_sysctl;
                break;
 #endif
        default:
-               fn = 0;
+               fnp = NULL;
        }
 
-       if (uap->oldlenp &&
-           (error = copyin(uap->oldlenp, &oldlen, sizeof(oldlen))))
-               return (error);
-
-       if (uap->old != NULL) {
-               if (!useracc(uap->old, oldlen, B_WRITE))
-                       return (EFAULT);
+       if (uap->oldlenp != USER_ADDR_NULL) {
+               uint64_t        oldlen64 = fuulong(uap->oldlenp);
 
-               /* The pc sampling mechanism does not need to take this lock */
-               if ((name[1] != KERN_PCSAMPLES) &&
-                   (!((name[1] == KERN_KDEBUG) && (name[2] == KERN_KDGETENTROPY)))) {
-                 while (memlock.sl_lock) {
-                       memlock.sl_want = 1;
-                       sleep((caddr_t)&memlock, PRIBIO+1);
-                       memlock.sl_locked++;
-                 }
-                 memlock.sl_lock = 1;
-               }
+               oldlen = CAST_DOWN(size_t, oldlen64);
+               /*
+                * If more than 4G, clamp to 4G - useracc() below will catch
+                * with an EFAULT, if it's actually necessary.
+                */
+               if (oldlen64 > 0x00000000ffffffffULL)
+                       oldlen = 0xffffffffUL;
+       }
 
-               if (dolock && oldlen && (error = vslock(uap->old, oldlen))) {
-                       if ((name[1] != KERN_PCSAMPLES) &&
-                          (! ((name[1] == KERN_KDEBUG) && (name[2] == KERN_KDGETENTROPY)))) {
-                               memlock.sl_lock = 0;
-                               if (memlock.sl_want) {
-                               memlock.sl_want = 0;
-                                       wakeup((caddr_t)&memlock);
-                               }
+       if (uap->old != USER_ADDR_NULL) {
+               if (!useracc(uap->old, (user_size_t)oldlen, B_WRITE))
+                       return (EFAULT);
+               /*
+                * The kernel debug mechanism does not need to take this lock, and
+                * we don't grab the memlock around calls to KERN_PROC because it is reentrant.
+                * Grabbing the lock for a KERN_PROC sysctl makes a deadlock possible 5024049.
+                */
+               if (!((name[1] == KERN_KDEBUG) && (name[2] == KERN_KDGETENTROPY)) &&
+                   !(name[1] == KERN_PROC)) {
+                       MEMLOCK_LOCK();
+                       memlock_taken = TRUE;
+                }
+
+               if (dolock && oldlen) {
+                       if ((error = vslock(uap->old, (user_size_t)oldlen))) {
+                               if (memlock_taken == TRUE)
+                                       MEMLOCK_UNLOCK();
+                               return(error);
                        }
-                       return(error);
+                       savelen = oldlen;
+                       vslock_taken = TRUE;
                }
-               savelen = oldlen;
        }
 
-       if (fn)
-           error = (*fn)(name + 1, uap->namelen - 1, uap->old,
-                         &oldlen, uap->new, uap->newlen, p);
+#if CONFIG_MACF
+       my_cred = kauth_cred_proc_ref(p);
+       error = mac_system_check_sysctl(
+           my_cred, 
+           (int *) name,
+           uap->namelen,
+           uap->old,
+           uap->oldlenp,
+           fnp == kern_sysctl ? 1 : 0,
+           uap->new,
+           newlen
+       );
+       kauth_cred_unref(&my_cred);
+       if (!error) {
+#endif
+       if (fnp) {
+               error = (*fnp)(name + 1, uap->namelen - 1, uap->old,
+                       &oldlen, uap->new, newlen, p);
+       }
        else
-           error = EOPNOTSUPP;
-
-       if ( (name[0] != CTL_VFS) && (error == EOPNOTSUPP))
-               error = userland_sysctl(p, name, uap->namelen,
-                                       uap->old, uap->oldlenp, 0,
-                                       uap->new, uap->newlen, &oldlen);
-
-       if (uap->old != NULL) {
-               if (dolock && savelen) {
-                       error1 = vsunlock(uap->old, savelen, B_WRITE);
-                       if (!error &&  error1)
-                               error = error1;
-               }
-               if (name[1] != KERN_PCSAMPLES) {
-                 memlock.sl_lock = 0;
-                 if (memlock.sl_want) {
-                       memlock.sl_want = 0;
-                       wakeup((caddr_t)&memlock);
-                 }
-               }
+               error = ENOTSUP;
+#if CONFIG_MACF
+       }
+#endif
+
+       if (vslock_taken == TRUE) {
+               error1 = vsunlock(uap->old, (user_size_t)savelen, B_WRITE);
+               if (!error)
+                       error = error1;
+        }
+       if (memlock_taken == TRUE)
+               MEMLOCK_UNLOCK();
+
+       if ( (name[0] != CTL_VFS) && (error == ENOTSUP)) {
+               size_t  tmp = oldlen;
+               boolean_t funnel_state;
+
+               /*
+                * Drop the funnel when calling new sysctl code, which will conditionally
+                * grab the funnel if it really needs to.
+                */
+               funnel_state = thread_funnel_set(kernel_flock, FALSE);
+               
+               error = userland_sysctl(p, name, uap->namelen, uap->old, &tmp, 
+                                       uap->new, newlen, &oldlen);
+
+               thread_funnel_set(kernel_flock, funnel_state);
        }
+
        if ((error) && (error != ENOMEM))
                return (error);
 
-       if (uap->oldlenp) {
-               i = copyout(&oldlen, uap->oldlenp, sizeof(oldlen));
-               if (i) 
-                   return i;
-       }
+       if (uap->oldlenp != USER_ADDR_NULL)
+               error = suulong(uap->oldlenp, oldlen);
 
        return (error);
 }
@@ -321,15 +410,14 @@ __sysctl(p, uap, retval)
 /*
  * Attributes stored in the kernel.
  */
-extern char hostname[MAXHOSTNAMELEN]; /* defined in bsd/kern/init_main.c */
-extern int hostnamelen;
-extern char domainname[MAXHOSTNAMELEN];
-extern int domainnamelen;
-extern char classichandler[32];
-extern long classichandler_fsid;
-extern long classichandler_fileid;
-
-extern long hostid;
+__private_extern__ char corefilename[MAXPATHLEN+1];
+__private_extern__ int do_coredump;
+__private_extern__ int sugid_coredump;
+
+#if COUNT_SYSCALLS
+__private_extern__ int do_count_syscalls;
+#endif
+
 #ifdef INSECURE
 int securelevel = -1;
 #else
@@ -337,284 +425,367 @@ int securelevel;
 #endif
 
 static int
-sysctl_affinity(name, namelen, oldBuf, oldSize, newBuf, newSize, cur_proc)
-       int *name;
-       u_int namelen;
-       char *oldBuf;
-       size_t *oldSize;
-       char *newBuf;
-       size_t newSize;
-       struct proc *cur_proc;
+sysctl_affinity(
+       int *name,
+       u_int namelen,
+       user_addr_t oldBuf,
+       size_t *oldSize,
+       user_addr_t newBuf,
+       __unused size_t newSize,
+       proc_t cur_proc)
 {
        if (namelen < 1)
-               return (EOPNOTSUPP);
+               return (ENOTSUP);
 
        if (name[0] == 0 && 1 == namelen) {
                return sysctl_rdint(oldBuf, oldSize, newBuf,
-                       (cur_proc->p_flag & P_AFFINITY) ? 1 : 0);
+                                       (cur_proc->p_flag & P_AFFINITY) ? 1 : 0);
        } else if (name[0] == 1 && 2 == namelen) {
                if (name[1] == 0) {
-                       cur_proc->p_flag &= ~P_AFFINITY;
+                       OSBitAndAtomic(~((uint32_t)P_AFFINITY), &cur_proc->p_flag);
                } else {
-                       cur_proc->p_flag |= P_AFFINITY;
+                       OSBitOrAtomic(P_AFFINITY, &cur_proc->p_flag);
                }
                return 0;
        }
-       return (EOPNOTSUPP);
+       return (ENOTSUP);
 }
 
 static int
-sysctl_classic(name, namelen, oldBuf, oldSize, newBuf, newSize, cur_proc)
-       int *name;
-       u_int namelen;
-       char *oldBuf;
-       size_t *oldSize;
-       char *newBuf;
-       size_t newSize;
-       struct proc *cur_proc;
-{
-       int newVal;
-       int err;
-       struct proc *p;
+sysctl_translate(
+       int *name,
+       u_int namelen,
+       user_addr_t oldBuf,
+       size_t *oldSize,
+       user_addr_t newBuf,
+       __unused size_t newSize,
+       proc_t cur_proc)
+{
+       proc_t p;
+       int istranslated = 0;
+       kauth_cred_t my_cred;
+       uid_t uid;
 
        if (namelen != 1)
-               return (EOPNOTSUPP);
+               return (ENOTSUP);
 
-       p = pfind(name[0]);
+       p = proc_find(name[0]);
        if (p == NULL)
                return (EINVAL);
 
-       if ((p->p_ucred->cr_uid != cur_proc->p_ucred->cr_uid) 
-               && suser(cur_proc->p_ucred, &cur_proc->p_acflag))
+       my_cred = kauth_cred_proc_ref(p);
+       uid = kauth_cred_getuid(my_cred);
+       kauth_cred_unref(&my_cred);
+       if ((uid != kauth_cred_getuid(kauth_cred_get())) 
+               && suser(kauth_cred_get(), &cur_proc->p_acflag)) {
+               proc_rele(p);
                return (EPERM);
+       }
 
+       istranslated = (p->p_flag & P_TRANSLATED);
+       proc_rele(p);
        return sysctl_rdint(oldBuf, oldSize, newBuf,
-               (p->p_flag & P_CLASSIC) ? 1 : 0);
+                               (istranslated != 0) ? 1 : 0);
 }
 
-static int
-sysctl_classichandler(name, namelen, oldBuf, oldSize, newBuf, newSize, p)
-       int *name;
-       u_int namelen;
-       char *oldBuf;
-       size_t *oldSize;
-       char *newBuf;
-       size_t newSize;
-       struct proc *p;
+int
+set_archhandler(__unused proc_t p, int arch)
 {
        int error;
-       int len;
        struct nameidata nd;
-       struct vattr vattr;
-       char handler[sizeof(classichandler)];
+       struct vnode_attr va;
+       vfs_context_t ctx = vfs_context_current();
+       struct exec_archhandler *archhandler;
+
+       switch(arch) {
+       case CPU_TYPE_POWERPC:
+               archhandler = &exec_archhandler_ppc;
+               break;
+       default:
+               return (EBADARCH);
+       }
 
-       if ((error = suser(p->p_ucred, &p->p_acflag)))
+       NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE,
+                  CAST_USER_ADDR_T(archhandler->path), ctx);
+       error = namei(&nd);
+       if (error)
                return (error);
-       len = strlen(classichandler) + 1;
-       if (oldBuf && *oldSize < len)
-               return (ENOMEM);
-       if (newBuf && newSize >= sizeof(classichandler))
-               return (ENAMETOOLONG);
-       *oldSize = len - 1;
+       nameidone(&nd);
+       
+       /* Check mount point */
+       if ((nd.ni_vp->v_mount->mnt_flag & MNT_NOEXEC) ||
+               (nd.ni_vp->v_type != VREG)) {
+               vnode_put(nd.ni_vp);
+               return (EACCES);
+       }
+       
+       VATTR_INIT(&va);
+       VATTR_WANTED(&va, va_fsid);
+       VATTR_WANTED(&va, va_fileid);
+       error = vnode_getattr(nd.ni_vp, &va, ctx);
+       if (error) {
+               vnode_put(nd.ni_vp);
+               return (error);
+       }
+       vnode_put(nd.ni_vp);
+       
+       archhandler->fsid = va.va_fsid;
+       archhandler->fileid = (u_int32_t)va.va_fileid;
+       return 0;
+}
+
+/* XXX remove once Rosetta is rev'ed */
+/*****************************************************************************/
+static int
+sysctl_exec_archhandler_ppc(
+       __unused int *name,
+       __unused u_int namelen,
+       user_addr_t oldBuf,
+       size_t *oldSize,
+       user_addr_t newBuf,
+       size_t newSize,
+       proc_t p)
+{
+       int error;
+       size_t len;
+       char handler[sizeof(exec_archhandler_ppc.path)];
+       vfs_context_t ctx = vfs_context_current();
+
+       if (oldSize) {
+               len = strlen(exec_archhandler_ppc.path) + 1;
+               if (oldBuf) {
+                       if (*oldSize < len)
+                               return (ENOMEM);
+                       error = copyout(exec_archhandler_ppc.path, oldBuf, len);
+                       if (error)
+                               return (error);
+               }
+               *oldSize = len - 1;
+       }
        if (newBuf) {
+               error = suser(vfs_context_ucred(ctx), &p->p_acflag);
+               if (error)
+                       return (error);
+               if (newSize >= sizeof(exec_archhandler_ppc.path))
+                       return (ENAMETOOLONG);
                error = copyin(newBuf, handler, newSize);
                if (error)
                        return (error);
                handler[newSize] = 0;
-
-               NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE,
-                               handler, p);
-               error = namei(&nd);
+               strlcpy(exec_archhandler_ppc.path, handler, MAXPATHLEN);
+               error = set_archhandler(p, CPU_TYPE_POWERPC);
                if (error)
                        return (error);
-               /* Check mount point */
-               if ((nd.ni_vp->v_mount->mnt_flag & MNT_NOEXEC) ||
-                       (nd.ni_vp->v_type != VREG)) {
-                       vput(nd.ni_vp);
-                       return (EACCES);
-               }
-               error = VOP_GETATTR(nd.ni_vp, &vattr, p->p_ucred, p);
-               if (error) {
-                       vput(nd.ni_vp);
-                       return (error);
-               }
-               classichandler_fsid = vattr.va_fsid;
-               classichandler_fileid = vattr.va_fileid;
-               vput(nd.ni_vp);
        }
-       if (oldBuf) {
-               error = copyout(classichandler, oldBuf, len);
-               if (error)
-                       return (error);
+       return 0;
+}
+/*****************************************************************************/
+
+static int
+sysctl_handle_exec_archhandler_ppc(struct sysctl_oid *oidp, void *arg1,
+               int arg2, struct sysctl_req *req)
+{
+       int error = 0;
+
+       error = sysctl_handle_string(oidp, arg1, arg2, req);
+
+       if (error)
+               goto done;
+
+       if (req->newptr)
+               error = set_archhandler(req->p, CPU_TYPE_POWERPC);
+
+done:
+       return error;
+
+}
+
+static int
+sysctl_handle_kern_threadname( __unused struct sysctl_oid *oidp, __unused void *arg1,
+             __unused int arg2, struct sysctl_req *req)
+{
+       int error;
+       struct uthread *ut = get_bsdthread_info(current_thread());
+       user_addr_t oldp=0, newp=0;
+       size_t *oldlenp=NULL;
+       size_t newlen=0;
+
+       oldp = req->oldptr;
+       oldlenp = &(req->oldlen);
+       newp = req->newptr;
+       newlen = req->newlen;
+
+       /* We want the current length, and maybe the string itself */
+       if(oldlenp) {
+               /* if we have no thread name yet tell'em we want MAXTHREADNAMESIZE - 1 */
+               size_t currlen = MAXTHREADNAMESIZE - 1;
+               
+               if(ut->pth_name)
+                       /* use length of current thread name */
+                       currlen = strlen(ut->pth_name);
+               if(oldp) {
+                       if(*oldlenp < currlen)
+                               return ENOMEM;
+                       /* NOTE - we do not copy the NULL terminator */
+                       if(ut->pth_name) {
+                               error = copyout(ut->pth_name,oldp,currlen);
+                               if(error)
+                                       return error;
+                       }
+               }       
+               /* return length of thread name minus NULL terminator (just like strlen)  */
+               req->oldidx = currlen;
        }
-       if (newBuf) {
-               strcpy(classichandler, handler);
+
+       /* We want to set the name to something */
+       if(newp) 
+       {
+               if(newlen > (MAXTHREADNAMESIZE - 1))
+                       return ENAMETOOLONG;
+               if(!ut->pth_name)
+               {
+                       ut->pth_name = (char*)kalloc( MAXTHREADNAMESIZE );
+                       if(!ut->pth_name)
+                               return ENOMEM;
+               }
+               bzero(ut->pth_name, MAXTHREADNAMESIZE);
+               error = copyin(newp, ut->pth_name, newlen);
+               if(error)
+                       return error;
        }
-       return (error);
+               
+       return 0;
 }
 
+SYSCTL_PROC(_kern, KERN_THREADNAME, threadname, CTLFLAG_ANYBODY | CTLTYPE_STRING | CTLFLAG_RW, 0, 0, sysctl_handle_kern_threadname,"A","");
 
-extern int get_kernel_symfile( struct proc *, char **);
-extern int sysctl_dopanicinfo(int *, u_int, void *, size_t *,
-                       void *, size_t, struct proc *);
+SYSCTL_NODE(_kern, KERN_EXEC, exec, CTLFLAG_RD|CTLFLAG_LOCKED, 0, "");
+
+SYSCTL_NODE(_kern_exec, OID_AUTO, archhandler, CTLFLAG_RD|CTLFLAG_LOCKED, 0, "");
+
+SYSCTL_PROC(_kern_exec_archhandler, OID_AUTO, powerpc,
+           CTLTYPE_STRING | CTLFLAG_RW, exec_archhandler_ppc.path, 0,
+           sysctl_handle_exec_archhandler_ppc, "A", "");
+
+extern int get_kernel_symfile(proc_t, char **);
+__private_extern__ int 
+sysctl_dopanicinfo(int *, u_int, user_addr_t, size_t *, user_addr_t, 
+                   size_t, proc_t);
 
 /*
  * kernel related system variables.
  */
 int
-kern_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
-       int *name;
-       u_int namelen;
-       void *oldp;
-       size_t *oldlenp;
-       void *newp;
-       size_t newlen;
-       struct proc *p;
-{
-       int error, level, inthostid;
-       unsigned int oldval=0;
-       char *str;
-       extern char ostype[], osrelease[], version[];
-       extern int netboot_root();
-
+kern_sysctl(int *name, u_int namelen, user_addr_t oldp, size_t *oldlenp, 
+            user_addr_t newp, size_t newlen, proc_t p)
+{
        /* all sysctl names not listed below are terminal at this level */
        if (namelen != 1
                && !(name[0] == KERN_PROC
                        || name[0] == KERN_PROF 
                        || name[0] == KERN_KDEBUG
+#if !CONFIG_EMBEDDED
                        || name[0] == KERN_PROCARGS
+#endif
                        || name[0] == KERN_PROCARGS2
-                       || name[0] == KERN_PCSAMPLES
                        || name[0] == KERN_IPC
                        || name[0] == KERN_SYSV
                        || name[0] == KERN_AFFINITY
-                       || name[0] == KERN_CLASSIC
-                       || name[0] == KERN_PANICINFO)
+                       || name[0] == KERN_TRANSLATE
+                       || name[0] == KERN_EXEC
+                       || name[0] == KERN_PANICINFO
+                       || name[0] == KERN_POSIX
+                       || name[0] == KERN_TFP
+                       || name[0] == KERN_TTY
+#if CONFIG_LCTX
+                       || name[0] == KERN_LCTX
+#endif
+                                               )
                )
                return (ENOTDIR);               /* overloaded */
 
        switch (name[0]) {
-       case KERN_OSTYPE:
-               return (sysctl_rdstring(oldp, oldlenp, newp, ostype));
-       case KERN_OSRELEASE:
-               return (sysctl_rdstring(oldp, oldlenp, newp, osrelease));
-       case KERN_OSREV:
-               return (sysctl_rdint(oldp, oldlenp, newp, BSD));
-       case KERN_VERSION:
-               return (sysctl_rdstring(oldp, oldlenp, newp, version));
-       case KERN_MAXVNODES:
-               oldval = desiredvnodes;
-               error = sysctl_int(oldp, oldlenp, newp, 
-                               newlen, &desiredvnodes);
-               reset_vmobjectcache(oldval, desiredvnodes);
-               resize_namecache(desiredvnodes);
-               return(error);
-       case KERN_MAXPROC:
-               return (sysctl_maxproc(oldp, oldlenp, newp, newlen));
-       case KERN_MAXFILES:
-               return (sysctl_int(oldp, oldlenp, newp, newlen, &maxfiles));
-       case KERN_MAXPROCPERUID:
-               return( sysctl_maxprocperuid( oldp, oldlenp, newp, newlen ) );
-       case KERN_MAXFILESPERPROC:
-               return( sysctl_maxfilesperproc( oldp, oldlenp, newp, newlen ) );
-       case KERN_ARGMAX:
-               return (sysctl_rdint(oldp, oldlenp, newp, ARG_MAX));
-       case KERN_SECURELVL:
-               level = securelevel;
-               if ((error = sysctl_int(oldp, oldlenp, newp, newlen, &level)) ||
-                   newp == NULL)
-                       return (error);
-               if (level < securelevel && p->p_pid != 1)
-                       return (EPERM);
-               securelevel = level;
-               return (0);
-       case KERN_HOSTNAME:
-               error = sysctl_string(oldp, oldlenp, newp, newlen,
-                   hostname, sizeof(hostname));
-               if (newp && !error)
-                       hostnamelen = newlen;
-               return (error);
-       case KERN_DOMAINNAME:
-               error = sysctl_string(oldp, oldlenp, newp, newlen,
-                   domainname, sizeof(domainname));
-               if (newp && !error)
-                       domainnamelen = newlen;
-               return (error);
-       case KERN_HOSTID:
-               inthostid = hostid;  /* XXX assumes sizeof long <= sizeof int */
-               error =  sysctl_int(oldp, oldlenp, newp, newlen, &inthostid);
-               hostid = inthostid;
-               return (error);
-       case KERN_CLOCKRATE:
-               return (sysctl_clockrate(oldp, oldlenp));
-       case KERN_BOOTTIME:
-               return (sysctl_rdstruct(oldp, oldlenp, newp, &boottime,
-                   sizeof(struct timeval)));
-       case KERN_VNODE:
-               return (sysctl_vnode(oldp, oldlenp));
        case KERN_PROC:
                return (sysctl_doproc(name + 1, namelen - 1, oldp, oldlenp));
-       case KERN_FILE:
-               return (sysctl_file(oldp, oldlenp));
 #ifdef GPROF
        case KERN_PROF:
                return (sysctl_doprof(name + 1, namelen - 1, oldp, oldlenp,
                    newp, newlen));
-#endif
-       case KERN_POSIX1:
-               return (sysctl_rdint(oldp, oldlenp, newp, _POSIX_VERSION));
-       case KERN_NGROUPS:
-               return (sysctl_rdint(oldp, oldlenp, newp, NGROUPS_MAX));
-       case KERN_JOB_CONTROL:
-               return (sysctl_rdint(oldp, oldlenp, newp, 1));
-       case KERN_SAVED_IDS:
-#ifdef _POSIX_SAVED_IDS
-               return (sysctl_rdint(oldp, oldlenp, newp, 1));
-#else
-               return (sysctl_rdint(oldp, oldlenp, newp, 0));
 #endif
        case KERN_KDEBUG:
                return (kdebug_ops(name + 1, namelen - 1, oldp, oldlenp, p));
-       case KERN_PCSAMPLES:
-               return (pcsamples_ops(name + 1, namelen - 1, oldp, oldlenp, p));
+#if !CONFIG_EMBEDDED
        case KERN_PROCARGS:
                /* new one as it does not use kinfo_proc */
                return (sysctl_procargs(name + 1, namelen - 1, oldp, oldlenp, p));
+#endif
        case KERN_PROCARGS2:
                /* new one as it does not use kinfo_proc */
                return (sysctl_procargs2(name + 1, namelen - 1, oldp, oldlenp, p));
-       case KERN_SYMFILE:
-               error = get_kernel_symfile( p, &str );
-               if ( error )
-                       return error;
-               return (sysctl_rdstring(oldp, oldlenp, newp, str));
-       case KERN_NETBOOT:
-               return (sysctl_rdint(oldp, oldlenp, newp, netboot_root()));
+#if PANIC_INFO
        case KERN_PANICINFO:
                return(sysctl_dopanicinfo(name + 1, namelen - 1, oldp, oldlenp,
                        newp, newlen, p));
+#endif
        case KERN_AFFINITY:
                return sysctl_affinity(name+1, namelen-1, oldp, oldlenp,
                                                                        newp, newlen, p);
-       case KERN_CLASSIC:
-               return sysctl_classic(name+1, namelen-1, oldp, oldlenp,
-                                                               newp, newlen, p);
-       case KERN_CLASSICHANDLER:
-               return sysctl_classichandler(name+1, namelen-1, oldp, oldlenp,
-                                                                               newp, newlen, p);
-       case KERN_AIOMAX:
-               return( sysctl_aiomax( oldp, oldlenp, newp, newlen ) );
-       case KERN_AIOPROCMAX:
-               return( sysctl_aioprocmax( oldp, oldlenp, newp, newlen ) );
-       case KERN_AIOTHREADS:
-               return( sysctl_aiothreads( oldp, oldlenp, newp, newlen ) );
+       case KERN_TRANSLATE:
+               return sysctl_translate(name+1, namelen-1, oldp, oldlenp, newp,
+                                     newlen, p);
+
+               /* XXX remove once Rosetta has rev'ed */
+       case KERN_EXEC:
+               return sysctl_exec_archhandler_ppc(name+1, namelen-1, oldp,
+                                                  oldlenp, newp, newlen, p);
+#if COUNT_SYSCALLS
+       case KERN_COUNT_SYSCALLS:
+       {
+               /* valid values passed in:
+                * = 0 means don't keep called counts for each bsd syscall
+                * > 0 means keep called counts for each bsd syscall
+                * = 2 means dump current counts to the system log
+                * = 3 means reset all counts
+                * for example, to dump current counts:  
+                *              sysctl -w kern.count_calls=2
+                */
+               error = sysctl_int(oldp, oldlenp, newp, newlen, &tmp);
+               if ( error != 0 ) {
+                       return (error);
+               }
+                       
+               if ( tmp == 1 ) {
+                       do_count_syscalls = 1;
+               }
+               else if ( tmp == 0 || tmp == 2 || tmp == 3 ) {
+                       extern int                      nsysent;
+                       extern int                      syscalls_log[];
+                       extern const char *     syscallnames[];
+                       int                     i;
+                       for ( i = 0; i < nsysent; i++ ) {
+                               if ( syscalls_log[i] != 0 ) {
+                                       if ( tmp == 2 ) {
+                                               printf("%d calls - name %s \n", syscalls_log[i], syscallnames[i]);
+                                       }
+                                       else {
+                                               syscalls_log[i] = 0;
+                                       }
+                               }
+                       }
+                       if ( tmp != 0 ) {
+                               do_count_syscalls = 1;
+                       }
+               }
+               return (0);
+       }
+#endif
        default:
-               return (EOPNOTSUPP);
+               return (ENOTSUP);
        }
        /* NOTREACHED */
 }
 
-#ifdef DEBUG
+#if DEBUG
 /*
  * Debugging related system variables.
  */
@@ -633,49 +804,53 @@ static struct ctldebug *debugvars[CTL_DEBUG_MAXID] = {
        &debug15, &debug16, &debug17, &debug18, &debug19,
 };
 int
-debug_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
-       int *name;
-       u_int namelen;
-       void *oldp;
-       size_t *oldlenp;
-       void *newp;
-       size_t newlen;
-       struct proc *p;
+debug_sysctl(int *name, u_int namelen, user_addr_t oldp, size_t *oldlenp, 
+             user_addr_t newp, size_t newlen, __unused proc_t p)
 {
        struct ctldebug *cdp;
 
        /* all sysctl names at this level are name and field */
        if (namelen != 2)
-               return (ENOTDIR);               /* overloaded */
+               return (ENOTSUP);               /* overloaded */
+       if (name[0] < 0 || name[0] >= CTL_DEBUG_MAXID)
+               return (ENOTSUP);
        cdp = debugvars[name[0]];
        if (cdp->debugname == 0)
-               return (EOPNOTSUPP);
+               return (ENOTSUP);
        switch (name[1]) {
        case CTL_DEBUG_NAME:
                return (sysctl_rdstring(oldp, oldlenp, newp, cdp->debugname));
        case CTL_DEBUG_VALUE:
                return (sysctl_int(oldp, oldlenp, newp, newlen, cdp->debugvar));
        default:
-               return (EOPNOTSUPP);
+               return (ENOTSUP);
        }
        /* NOTREACHED */
 }
 #endif /* DEBUG */
 
+/*
+ * The following sysctl_* functions should not be used
+ * any more, as they can only cope with callers in
+ * user mode: Use new-style
+ *  sysctl_io_number()
+ *  sysctl_io_string()
+ *  sysctl_io_opaque()
+ * instead.
+ */
+
 /*
  * Validate parameters and get old / set new parameters
  * for an integer-valued sysctl function.
  */
 int
-sysctl_int(oldp, oldlenp, newp, newlen, valp)
-       void *oldp;
-       size_t *oldlenp;
-       void *newp;
-       size_t newlen;
-       int *valp;
+sysctl_int(user_addr_t oldp, size_t *oldlenp, 
+           user_addr_t newp, size_t newlen, int *valp)
 {
        int error = 0;
 
+       if (oldp != USER_ADDR_NULL && oldlenp == NULL)
+               return (EFAULT);
        if (oldp && *oldlenp < sizeof(int))
                return (ENOMEM);
        if (newp && newlen != sizeof(int))
@@ -683,8 +858,10 @@ sysctl_int(oldp, oldlenp, newp, newlen, valp)
        *oldlenp = sizeof(int);
        if (oldp)
                error = copyout(valp, oldp, sizeof(int));
-       if (error == 0 && newp)
+       if (error == 0 && newp) {
                error = copyin(newp, valp, sizeof(int));
+               AUDIT_ARG(value32, *valp);
+       }
        return (error);
 }
 
@@ -692,14 +869,12 @@ sysctl_int(oldp, oldlenp, newp, newlen, valp)
  * As above, but read-only.
  */
 int
-sysctl_rdint(oldp, oldlenp, newp, val)
-       void *oldp;
-       size_t *oldlenp;
-       void *newp;
-       int val;
+sysctl_rdint(user_addr_t oldp, size_t *oldlenp, user_addr_t newp, int val)
 {
        int error = 0;
 
+       if (oldp != USER_ADDR_NULL && oldlenp == NULL)
+               return (EFAULT);
        if (oldp && *oldlenp < sizeof(int))
                return (ENOMEM);
        if (newp)
@@ -715,15 +890,13 @@ sysctl_rdint(oldp, oldlenp, newp, val)
  * for an quad(64bit)-valued sysctl function.
  */
 int
-sysctl_quad(oldp, oldlenp, newp, newlen, valp)
-       void *oldp;
-       size_t *oldlenp;
-       void *newp;
-       size_t newlen;
-       quad_t *valp;
+sysctl_quad(user_addr_t oldp, size_t *oldlenp, 
+            user_addr_t newp, size_t newlen, quad_t *valp)
 {
        int error = 0;
 
+       if (oldp != USER_ADDR_NULL && oldlenp == NULL)
+               return (EFAULT);
        if (oldp && *oldlenp < sizeof(quad_t))
                return (ENOMEM);
        if (newp && newlen != sizeof(quad_t))
@@ -740,14 +913,12 @@ sysctl_quad(oldp, oldlenp, newp, newlen, valp)
  * As above, but read-only.
  */
 int
-sysctl_rdquad(oldp, oldlenp, newp, val)
-       void *oldp;
-       size_t *oldlenp;
-       void *newp;
-       quad_t val;
+sysctl_rdquad(user_addr_t oldp, size_t *oldlenp, user_addr_t newp, quad_t val)
 {
        int error = 0;
 
+       if (oldp != USER_ADDR_NULL && oldlenp == NULL)
+               return (EFAULT);
        if (oldp && *oldlenp < sizeof(quad_t))
                return (ENOMEM);
        if (newp)
@@ -758,25 +929,65 @@ sysctl_rdquad(oldp, oldlenp, newp, val)
        return (error);
 }
 
+/*
+ * Validate parameters and get old / set new parameters
+ * for a string-valued sysctl function.  Unlike sysctl_string, if you
+ * give it a too small (but larger than 0 bytes) buffer, instead of
+ * returning ENOMEM, it truncates the returned string to the buffer
+ * size.  This preserves the semantics of some library routines
+ * implemented via sysctl, which truncate their returned data, rather
+ * than simply returning an error. The returned string is always NUL
+ * terminated.
+ */
+int
+sysctl_trstring(user_addr_t oldp, size_t *oldlenp, 
+              user_addr_t newp, size_t newlen, char *str, int maxlen)
+{
+       int len, copylen, error = 0;
+
+       if (oldp != USER_ADDR_NULL && oldlenp == NULL)
+               return (EFAULT);
+       copylen = len = strlen(str) + 1;
+       if (oldp && (len < 0 || *oldlenp < 1))
+               return (ENOMEM);
+       if (oldp && (*oldlenp < (size_t)len))
+               copylen = *oldlenp + 1;
+       if (newp && (maxlen < 0 || newlen >= (size_t)maxlen))
+               return (EINVAL);
+       *oldlenp = copylen - 1; /* deal with NULL strings correctly */
+       if (oldp) {
+               error = copyout(str, oldp, copylen);
+               if (!error) {
+                       unsigned char c = 0;
+                       /* NUL terminate */
+                       oldp += *oldlenp;
+                       error = copyout((void *)&c, oldp, sizeof(char));
+               }
+       }
+       if (error == 0 && newp) {
+               error = copyin(newp, str, newlen);
+               str[newlen] = 0;
+               AUDIT_ARG(text, (char *)str);
+       }
+       return (error);
+}
+
 /*
  * Validate parameters and get old / set new parameters
  * for a string-valued sysctl function.
  */
 int
-sysctl_string(oldp, oldlenp, newp, newlen, str, maxlen)
-       void *oldp;
-       size_t *oldlenp;
-       void *newp;
-       size_t newlen;
-       char *str;
-       int maxlen;
+sysctl_string(user_addr_t oldp, size_t *oldlenp, 
+              user_addr_t newp, size_t newlen, char *str, int maxlen)
 {
        int len, error = 0;
 
+       if (oldp != USER_ADDR_NULL && oldlenp == NULL)
+               return (EFAULT);
        len = strlen(str) + 1;
-       if (oldp && *oldlenp < len)
+       if (oldp && (len < 0 || *oldlenp < (size_t)len))
                return (ENOMEM);
-       if (newp && newlen >= maxlen)
+       if (newp && (maxlen < 0 || newlen >= (size_t)maxlen))
                return (EINVAL);
        *oldlenp = len -1; /* deal with NULL strings correctly */
        if (oldp) {
@@ -785,6 +996,7 @@ sysctl_string(oldp, oldlenp, newp, newlen, str, maxlen)
        if (error == 0 && newp) {
                error = copyin(newp, str, newlen);
                str[newlen] = 0;
+               AUDIT_ARG(text, (char *)str);
        }
        return (error);
 }
@@ -793,16 +1005,15 @@ sysctl_string(oldp, oldlenp, newp, newlen, str, maxlen)
  * As above, but read-only.
  */
 int
-sysctl_rdstring(oldp, oldlenp, newp, str)
-       void *oldp;
-       size_t *oldlenp;
-       void *newp;
-       char *str;
+sysctl_rdstring(user_addr_t oldp, size_t *oldlenp, 
+                user_addr_t newp, char *str)
 {
        int len, error = 0;
 
+       if (oldp != USER_ADDR_NULL && oldlenp == NULL)
+               return (EFAULT);
        len = strlen(str) + 1;
-       if (oldp && *oldlenp < len)
+       if (oldp && *oldlenp < (size_t)len)
                return (ENOMEM);
        if (newp)
                return (EPERM);
@@ -817,19 +1028,16 @@ sysctl_rdstring(oldp, oldlenp, newp, str)
  * for a structure oriented sysctl function.
  */
 int
-sysctl_struct(oldp, oldlenp, newp, newlen, sp, len)
-       void *oldp;
-       size_t *oldlenp;
-       void *newp;
-       size_t newlen;
-       void *sp;
-       int len;
+sysctl_struct(user_addr_t oldp, size_t *oldlenp, 
+              user_addr_t newp, size_t newlen, void *sp, int len)
 {
        int error = 0;
 
-       if (oldp && *oldlenp < len)
+       if (oldp != USER_ADDR_NULL && oldlenp == NULL)
+               return (EFAULT);
+       if (oldp && (len < 0 || *oldlenp < (size_t)len))
                return (ENOMEM);
-       if (newp && newlen > len)
+       if (newp && (len < 0 || newlen > (size_t)len))
                return (EINVAL);
        if (oldp) {
                *oldlenp = len;
@@ -845,15 +1053,14 @@ sysctl_struct(oldp, oldlenp, newp, newlen, sp, len)
  * for a structure oriented sysctl function.
  */
 int
-sysctl_rdstruct(oldp, oldlenp, newp, sp, len)
-       void *oldp;
-       size_t *oldlenp;
-       void *newp, *sp;
-       int len;
+sysctl_rdstruct(user_addr_t oldp, size_t *oldlenp, 
+                user_addr_t newp, void *sp, int len)
 {
        int error = 0;
 
-       if (oldp && *oldlenp < len)
+       if (oldp != USER_ADDR_NULL && oldlenp == NULL)
+               return (EFAULT);
+       if (oldp && (len < 0 || *oldlenp < (size_t)len))
                return (ENOMEM);
        if (newp)
                return (EPERM);
@@ -866,145 +1073,284 @@ sysctl_rdstruct(oldp, oldlenp, newp, sp, len)
 /*
  * Get file structures.
  */
-int
-sysctl_file(where, sizep)
-       char *where;
-       size_t *sizep;
+static int
+sysctl_file
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
 {
-       int buflen, error;
-       struct file *fp;
-       char *start = where;
+       int error;
+       struct fileglob *fg;
+       struct extern_file nef;
 
-       buflen = *sizep;
-       if (where == NULL) {
+       if (req->oldptr == USER_ADDR_NULL) {
                /*
                 * overestimate by 10 files
                 */
-               *sizep = sizeof(filehead) + (nfiles + 10) * sizeof(struct file);
+               req->oldidx = sizeof(filehead) + (nfiles + 10) * sizeof(struct extern_file);
                return (0);
        }
 
        /*
         * first copyout filehead
         */
-       if (buflen < sizeof(filehead)) {
-               *sizep = 0;
-               return (0);
-       }
-       if (error = copyout((caddr_t)&filehead, where, sizeof(filehead)))
+       error = SYSCTL_OUT(req, &filehead, sizeof(filehead));
+       if (error)
                return (error);
-       buflen -= sizeof(filehead);
-       where += sizeof(filehead);
 
        /*
         * followed by an array of file structures
         */
-       for (fp = filehead.lh_first; fp != 0; fp = fp->f_list.le_next) {
-               if (buflen < sizeof(struct file)) {
-                       *sizep = where - start;
-                       return (ENOMEM);
-               }
-               if (error = copyout((caddr_t)fp, where, sizeof (struct file)))
+       for (fg = filehead.lh_first; fg != 0; fg = fg->f_list.le_next) {
+        nef.f_list.le_next =  (struct extern_file *)fg->f_list.le_next;
+        nef.f_list.le_prev =  (struct extern_file **)fg->f_list.le_prev;
+               nef.f_flag = (fg->fg_flag & FMASK);
+               nef.f_type = fg->fg_type;
+               nef.f_count = fg->fg_count;
+               nef.f_msgcount = fg->fg_msgcount;
+               nef.f_cred = fg->fg_cred;
+               nef.f_ops = fg->fg_ops;
+               nef.f_offset = fg->fg_offset;
+               nef.f_data = fg->fg_data;
+               error = SYSCTL_OUT(req, &nef, sizeof(nef));
+               if (error)
                        return (error);
-               buflen -= sizeof(struct file);
-               where += sizeof(struct file);
        }
-       *sizep = where - start;
        return (0);
 }
 
-/*
- * try over estimating by 5 procs
- */
-#define KERN_PROCSLOP  (5 * sizeof (struct kinfo_proc))
+SYSCTL_PROC(_kern, KERN_FILE, file,
+               CTLTYPE_STRUCT | CTLFLAG_RW,
+               0, 0, sysctl_file, "S,filehead", "");
 
-int
-sysctl_doproc(name, namelen, where, sizep)
-       int *name;
-       u_int namelen;
-       char *where;
-       size_t *sizep;
-{
-       register struct proc *p;
-       register struct kinfo_proc *dp = (struct kinfo_proc *)where;
-       register int needed = 0;
-       int buflen = where != NULL ? *sizep : 0;
-       int doingzomb;
-       struct kinfo_proc kproc;
-       int error = 0;
+static int
+sysdoproc_filt_KERN_PROC_PID(proc_t p, void * arg)
+{
+       if (p->p_pid != (pid_t)*(int*)arg)
+               return(0);
+       else
+               return(1);
+}
 
-       if (namelen != 2 && !(namelen == 1 && name[0] == KERN_PROC_ALL))
-               return (EINVAL);
-       p = allproc.lh_first;
-       doingzomb = 0;
-again:
-       for (; p != 0; p = p->p_list.le_next) {
-               /*
-                * Skip embryonic processes.
-                */
-               if (p->p_stat == SIDL)
-                       continue;
-               /*
-                * TODO - make more efficient (see notes below).
-                * do by session.
-                */
-               switch (name[0]) {
+static int
+sysdoproc_filt_KERN_PROC_PGRP(proc_t p, void * arg)
+{
+       if (p->p_pgrpid != (pid_t)*(int*)arg)
+               return(0);
+       else
+         return(1);
+}
 
-               case KERN_PROC_PID:
-                       /* could do this with just a lookup */
-                       if (p->p_pid != (pid_t)name[1])
-                               continue;
-                       break;
+static int
+sysdoproc_filt_KERN_PROC_TTY(proc_t p, void * arg)
+{
+       boolean_t funnel_state;
+       int retval;
+       struct tty *tp;
 
-               case KERN_PROC_PGRP:
-                       /* could do this by traversing pgrp */
-                       if (p->p_pgrp->pg_id != (pid_t)name[1])
-                               continue;
-                       break;
+       
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);
+       /* This is very racy but list lock is held.. Hmmm. */
+       if ((p->p_flag & P_CONTROLT) == 0 ||
+               (p->p_pgrp == NULL) || (p->p_pgrp->pg_session == NULL) ||
+                       (tp = SESSION_TP(p->p_pgrp->pg_session)) == TTY_NULL ||
+                       tp->t_dev != (dev_t)*(int*)arg)
+                               retval = 0;
+       else
+               retval = 1;
 
-               case KERN_PROC_TTY:
-                       if ((p->p_flag & P_CONTROLT) == 0 ||
-                               (p->p_session == NULL) ||
-                           p->p_session->s_ttyp == NULL ||
-                           p->p_session->s_ttyp->t_dev != (dev_t)name[1])
-                               continue;
-                       break;
+       thread_funnel_set(kernel_flock, funnel_state);
 
-               case KERN_PROC_UID:
-                       if ((p->p_ucred == NULL) ||
-                               (p->p_ucred->cr_uid != (uid_t)name[1]))
-                               continue;
-                       break;
+       return(retval);
+}
 
-               case KERN_PROC_RUID:
-                       if ((p->p_ucred == NULL) ||
-                               (p->p_cred->p_ruid != (uid_t)name[1]))
-                               continue;
-                       break;
-               }
-               if (buflen >= sizeof(struct kinfo_proc)) {
-                       bzero(&kproc, sizeof(struct kinfo_proc));
-                       fill_proc(p, &kproc);
-                       if (error = copyout((caddr_t)&kproc, &dp->kp_proc,
-                           sizeof(struct kinfo_proc)))
-                               return (error);
-                       dp++;
-                       buflen -= sizeof(struct kinfo_proc);
-               }
-               needed += sizeof(struct kinfo_proc);
-       }
-       if (doingzomb == 0) {
-               p = zombproc.lh_first;
-               doingzomb++;
-               goto again;
-       }
-       if (where != NULL) {
-               *sizep = (caddr_t)dp - where;
-               if (needed > *sizep)
-                       return (ENOMEM);
-       } else {
-               needed += KERN_PROCSLOP;
-               *sizep = needed;
+static int
+sysdoproc_filt_KERN_PROC_UID(proc_t p, void * arg)
+{
+       kauth_cred_t my_cred;
+       uid_t uid;
+
+       if (p->p_ucred == NULL)
+               return(0);
+       my_cred = kauth_cred_proc_ref(p);
+       uid = kauth_cred_getuid(my_cred);
+       kauth_cred_unref(&my_cred);
+
+       if (uid != (uid_t)*(int*)arg)
+               return(0);
+       else
+               return(1);
+}
+
+
+static int
+sysdoproc_filt_KERN_PROC_RUID(proc_t p, void * arg)
+{
+       kauth_cred_t my_cred;
+       uid_t ruid;
+
+       if (p->p_ucred == NULL)
+               return(0);
+       my_cred = kauth_cred_proc_ref(p);
+       ruid = my_cred->cr_ruid;
+       kauth_cred_unref(&my_cred);
+
+       if (ruid != (uid_t)*(int*)arg)
+               return(0);
+       else
+               return(1);
+}
+
+#if CONFIG_LCTX
+static int
+sysdoproc_filt_KERN_PROC_LCID(proc_t p, void * arg)
+{
+       if ((p->p_lctx == NULL) ||
+               (p->p_lctx->lc_id != (pid_t)*(int*)arg))
+               return(0);
+       else
+               return(1);
+}
+#endif
+
+/*
+ * try over estimating by 5 procs
+ */
+#define KERN_PROCSLOP  (5 * sizeof (struct kinfo_proc))
+struct sysdoproc_args {
+       int     buflen;
+       caddr_t kprocp;
+       boolean_t is_64_bit;
+       user_addr_t     dp;
+       size_t needed;
+       int sizeof_kproc;
+       int * errorp;
+       int uidcheck;
+       int ruidcheck;
+       int ttycheck;
+       int uidval;
+};
+
+int
+sysdoproc_callback(proc_t p, void * arg)
+{
+       struct sysdoproc_args * args = (struct sysdoproc_args *)arg;
+       int error=0;
+
+       if (args->buflen >= args->sizeof_kproc) {
+               if ((args->ruidcheck != 0)  && (sysdoproc_filt_KERN_PROC_RUID(p, &args->uidval) == 0))
+                       return(PROC_RETURNED);
+               if ((args->uidcheck != 0)  && (sysdoproc_filt_KERN_PROC_UID(p, &args->uidval) == 0))
+                       return(PROC_RETURNED);
+               if ((args->ttycheck != 0)  && (sysdoproc_filt_KERN_PROC_TTY(p, &args->uidval) == 0))
+                       return(PROC_RETURNED);
+
+               bzero(args->kprocp, args->sizeof_kproc);
+               if (args->is_64_bit) {
+                       fill_user64_proc(p, (struct user64_kinfo_proc *) args->kprocp);
+               }
+               else {
+                       fill_user32_proc(p, (struct user32_kinfo_proc *) args->kprocp);
+               }
+               error = copyout(args->kprocp, args->dp, args->sizeof_kproc);
+               if (error) {
+                       *args->errorp = error;
+                       return(PROC_RETURNED_DONE);
+                       return (error);
+               }
+               args->dp += args->sizeof_kproc;
+               args->buflen -= args->sizeof_kproc;
+       }
+       args->needed += args->sizeof_kproc;
+       return(PROC_RETURNED);
+}
+
+int
+sysctl_doproc(int *name, u_int namelen, user_addr_t where, size_t *sizep)
+{
+       user_addr_t dp = where;
+       size_t needed = 0;
+       int buflen = where != USER_ADDR_NULL ? *sizep : 0;
+       int error = 0;
+       boolean_t is_64_bit = FALSE;
+       struct user32_kinfo_proc  user32_kproc;
+       struct user64_kinfo_proc  user_kproc;
+       int sizeof_kproc;
+       caddr_t kprocp;
+       int (*filterfn)(proc_t, void *) = 0;
+       struct sysdoproc_args args;
+       int uidcheck = 0;
+       int ruidcheck = 0;
+       int ttycheck = 0;
+
+       if (namelen != 2 && !(namelen == 1 && name[0] == KERN_PROC_ALL))
+               return (EINVAL);
+       is_64_bit = proc_is64bit(current_proc()); 
+       if (is_64_bit) {
+               sizeof_kproc = sizeof(user_kproc);
+               kprocp = (caddr_t) &user_kproc;
+       }
+       else {
+               sizeof_kproc = sizeof(user32_kproc);
+               kprocp = (caddr_t) &user32_kproc;
+       }
+
+
+       switch (name[0]) {
+
+               case KERN_PROC_PID:
+                       filterfn = sysdoproc_filt_KERN_PROC_PID;
+                       break;
+
+               case KERN_PROC_PGRP:
+                       filterfn = sysdoproc_filt_KERN_PROC_PGRP;
+                       break;
+       
+               case KERN_PROC_TTY:
+                       ttycheck = 1;
+                       break;
+
+               case KERN_PROC_UID:
+                       uidcheck = 1;
+                       break;
+
+               case KERN_PROC_RUID:
+                       ruidcheck = 1;
+                       break;
+
+#if CONFIG_LCTX
+               case KERN_PROC_LCID:
+                       filterfn = sysdoproc_filt_KERN_PROC_LCID;
+                       break;
+#endif
+       }
+
+       error = 0;
+       args.buflen = buflen;
+       args.kprocp = kprocp;
+       args.is_64_bit = is_64_bit;
+       args.dp = dp;
+       args.needed = needed;
+       args.errorp = &error;
+       args.uidcheck = uidcheck;
+       args.ruidcheck = ruidcheck;
+       args.ttycheck = ttycheck;
+       args.sizeof_kproc = sizeof_kproc;
+       args.uidval = name[1];
+
+       proc_iterate((PROC_ALLPROCLIST | PROC_ZOMBPROCLIST), sysdoproc_callback, &args, filterfn, &name[1]);
+
+       if (error)
+               return(error);
+
+       dp = args.dp;
+       needed = args.needed;
+       
+       if (where != USER_ADDR_NULL) {
+               *sizep = dp - where;
+               if (needed > *sizep)
+                       return (ENOMEM);
+       } else {
+               needed += KERN_PROCSLOP;
+               *sizep = needed;
        }
        return (0);
 }
@@ -1013,29 +1359,135 @@ again:
  * Fill in an eproc structure for the specified process.
  */
 static void
-fill_eproc(p, ep)
-       register struct proc *p;
-       register struct eproc *ep;
-{
-       register struct tty *tp;
-
-       ep->e_paddr = p;
-       if (p->p_pgrp) {
-               ep->e_sess = p->p_pgrp->pg_session;
-               ep->e_pgid = p->p_pgrp->pg_id;
-               ep->e_jobc = p->p_pgrp->pg_jobc;
-               if (ep->e_sess && ep->e_sess->s_ttyvp)
+fill_user32_eproc(proc_t p, struct user32_eproc *ep)
+{
+       struct tty *tp;
+       kauth_cred_t my_cred;
+       struct pgrp * pg;
+       struct session * sessp;
+
+       pg = proc_pgrp(p);
+       sessp = proc_session(p);
+
+       ep->e_paddr = CAST_DOWN_EXPLICIT(uint32_t,p);
+
+       if (pg != PGRP_NULL) {
+               ep->e_sess = CAST_DOWN_EXPLICIT(uint32_t,sessp);
+               ep->e_pgid = p->p_pgrpid;
+               ep->e_jobc = pg->pg_jobc;
+               if ((sessp != SESSION_NULL) && sessp->s_ttyvp)
                        ep->e_flag = EPROC_CTTY;
        } else {
-               ep->e_sess = (struct session *)0;
+               ep->e_sess = 0;
+               ep->e_pgid = 0;
+               ep->e_jobc = 0;
+       }
+#if CONFIG_LCTX
+       if (p->p_lctx) {
+               ep->e_lcid = p->p_lctx->lc_id;
+       } else {
+               ep->e_lcid = 0;
+       }
+#endif
+       ep->e_ppid = p->p_ppid;
+       /* Pre-zero the fake historical pcred */
+       bzero(&ep->e_pcred, sizeof(ep->e_pcred));
+       if (p->p_ucred) {
+               my_cred = kauth_cred_proc_ref(p);
+
+               /* A fake historical pcred */
+               ep->e_pcred.p_ruid = my_cred->cr_ruid;
+               ep->e_pcred.p_svuid = my_cred->cr_svuid;
+               ep->e_pcred.p_rgid = my_cred->cr_rgid;
+               ep->e_pcred.p_svgid = my_cred->cr_svgid;
+               /* A fake historical *kauth_cred_t */
+               ep->e_ucred.cr_ref = my_cred->cr_ref;
+               ep->e_ucred.cr_uid = kauth_cred_getuid(my_cred);
+               ep->e_ucred.cr_ngroups = my_cred->cr_ngroups;
+               bcopy(my_cred->cr_groups, ep->e_ucred.cr_groups, NGROUPS*sizeof(gid_t));
+
+               kauth_cred_unref(&my_cred);
+       }
+       if (p->p_stat == SIDL || p->p_stat == SZOMB) {
+               ep->e_vm.vm_tsize = 0;
+               ep->e_vm.vm_dsize = 0;
+               ep->e_vm.vm_ssize = 0;
+       }
+       ep->e_vm.vm_rssize = 0;
+
+       if ((p->p_flag & P_CONTROLT) && (sessp != SESSION_NULL) &&
+            (tp = SESSION_TP(sessp))) {
+               ep->e_tdev = tp->t_dev;
+               ep->e_tpgid = sessp->s_ttypgrpid;
+               ep->e_tsess = CAST_DOWN_EXPLICIT(uint32_t,tp->t_session);
+       } else
+               ep->e_tdev = NODEV;
+
+       if (SESS_LEADER(p, sessp))
+               ep->e_flag |= EPROC_SLEADER;
+       bzero(&ep->e_wmesg[0], WMESGLEN+1);
+       ep->e_xsize = ep->e_xrssize = 0;
+       ep->e_xccount = ep->e_xswrss = 0;
+       if (sessp != SESSION_NULL)
+               session_rele(sessp);
+       if(pg != PGRP_NULL)
+               pg_rele(pg);
+}
+
+/*
+ * Fill in an LP64 version of eproc structure for the specified process.
+ */
+static void
+fill_user64_eproc(proc_t p, struct user64_eproc *ep)
+{
+       struct tty *tp;
+       struct  session *sessp = NULL;
+       struct pgrp * pg;
+       kauth_cred_t my_cred;
+       
+       pg = proc_pgrp(p);
+       sessp = proc_session(p);
+
+       ep->e_paddr = CAST_USER_ADDR_T(p);
+       if (pg != PGRP_NULL) {
+               ep->e_sess = CAST_USER_ADDR_T(sessp);
+               ep->e_pgid = p->p_pgrpid;
+               ep->e_jobc = pg->pg_jobc;
+               if (sessp != SESSION_NULL) {
+                       if (sessp->s_ttyvp)
+                           ep->e_flag = EPROC_CTTY;
+               }
+       } else {
+               ep->e_sess = USER_ADDR_NULL;
                ep->e_pgid = 0;
                ep->e_jobc = 0;
        }
-       ep->e_ppid = (p->p_pptr) ? p->p_pptr->p_pid : 0;
-       if (p->p_cred) {
-               ep->e_pcred = *p->p_cred;
-               if (p->p_ucred)
-                       ep->e_ucred = *p->p_ucred;
+#if CONFIG_LCTX
+       if (p->p_lctx) {
+               ep->e_lcid = p->p_lctx->lc_id;
+       } else {
+               ep->e_lcid = 0;
+       }
+#endif
+       ep->e_ppid = p->p_ppid;
+       /* Pre-zero the fake historical pcred */
+       bzero(&ep->e_pcred, sizeof(ep->e_pcred));
+       if (p->p_ucred) {
+               my_cred = kauth_cred_proc_ref(p);
+
+               /* A fake historical pcred */
+               ep->e_pcred.p_ruid = my_cred->cr_ruid;
+               ep->e_pcred.p_svuid = my_cred->cr_svuid;
+               ep->e_pcred.p_rgid = my_cred->cr_rgid;
+               ep->e_pcred.p_svgid = my_cred->cr_svgid;
+
+               /* A fake historical *kauth_cred_t */
+               ep->e_ucred.cr_ref = my_cred->cr_ref;
+               ep->e_ucred.cr_uid = kauth_cred_getuid(my_cred);
+               ep->e_ucred.cr_ngroups = my_cred->cr_ngroups;
+               bcopy(my_cred->cr_groups, ep->e_ucred.cr_groups, NGROUPS*sizeof(gid_t));
+
+               kauth_cred_unref(&my_cred);
        }
        if (p->p_stat == SIDL || p->p_stat == SZOMB) {
                ep->e_vm.vm_tsize = 0;
@@ -1044,103 +1496,187 @@ fill_eproc(p, ep)
        }
        ep->e_vm.vm_rssize = 0;
 
-       if ((p->p_flag & P_CONTROLT) && (ep->e_sess) &&
-            (tp = ep->e_sess->s_ttyp)) {
+       if ((p->p_flag & P_CONTROLT) && (sessp != SESSION_NULL) &&
+            (tp = SESSION_TP(sessp))) {
                ep->e_tdev = tp->t_dev;
-               ep->e_tpgid = tp->t_pgrp ? tp->t_pgrp->pg_id : NO_PID;
-               ep->e_tsess = tp->t_session;
+               ep->e_tpgid = sessp->s_ttypgrpid;
+               ep->e_tsess = CAST_USER_ADDR_T(tp->t_session);
        } else
                ep->e_tdev = NODEV;
 
-       if (SESS_LEADER(p))
+       if (SESS_LEADER(p, sessp))
                ep->e_flag |= EPROC_SLEADER;
-       if (p->p_wmesg)
-               strncpy(ep->e_wmesg, p->p_wmesg, WMESGLEN);
+       bzero(&ep->e_wmesg[0], WMESGLEN+1);
        ep->e_xsize = ep->e_xrssize = 0;
        ep->e_xccount = ep->e_xswrss = 0;
+       if (sessp != SESSION_NULL)
+               session_rele(sessp);
+       if (pg != PGRP_NULL)
+               pg_rele(pg);
 }
 
 /*
  * Fill in an eproc structure for the specified process.
  */
 static void
-fill_externproc(p, exp)
-       register struct proc *p;
-       register struct extern_proc *exp;
-{
-       exp->p_forw = exp->p_back = NULL;
-       if (p->p_stats)
-               exp->p_starttime = p->p_stats->p_start;
-       exp->p_vmspace = NULL;
-       exp->p_sigacts = p->p_sigacts;
+fill_user32_externproc(proc_t p, struct user32_extern_proc *exp)
+{
+       exp->p_forw = exp->p_back = 0;
+       exp->p_starttime.tv_sec = p->p_start.tv_sec;
+       exp->p_starttime.tv_usec = p->p_start.tv_usec;
+       exp->p_vmspace = 0;
+       exp->p_sigacts = CAST_DOWN_EXPLICIT(uint32_t,p->p_sigacts);
        exp->p_flag  = p->p_flag;
+       if (p->p_lflag & P_LTRACED)
+               exp->p_flag |= P_TRACED;
+       if (p->p_lflag & P_LPPWAIT)
+               exp->p_flag |= P_PPWAIT;
+       if (p->p_lflag & P_LEXIT)
+               exp->p_flag |= P_WEXIT;
        exp->p_stat  = p->p_stat ;
        exp->p_pid  = p->p_pid ;
        exp->p_oppid  = p->p_oppid ;
-       exp->p_dupfd  = p->p_dupfd ;
        /* Mach related  */
-       exp->user_stack  = p->user_stack ;
-       exp->exit_thread  = p->exit_thread ;
+       exp->user_stack  = p->user_stack;
+       exp->exit_thread  = CAST_DOWN_EXPLICIT(uint32_t,p->exit_thread);
        exp->p_debugger  = p->p_debugger ;
        exp->sigwait  = p->sigwait ;
        /* scheduling */
+#ifdef _PROC_HAS_SCHEDINFO_
        exp->p_estcpu  = p->p_estcpu ;
-       exp->p_cpticks  = p->p_cpticks ;
        exp->p_pctcpu  = p->p_pctcpu ;
-       exp->p_wchan  = p->p_wchan ;
-       exp->p_wmesg  = p->p_wmesg ;
-       exp->p_swtime  = p->p_swtime ;
        exp->p_slptime  = p->p_slptime ;
+#else
+       exp->p_estcpu  = 0 ;
+       exp->p_pctcpu  = 0 ;
+       exp->p_slptime = 0 ;
+#endif
+       exp->p_cpticks  = 0 ;
+       exp->p_wchan  = 0 ;
+       exp->p_wmesg  = 0 ;
+       exp->p_swtime  = 0 ;
        bcopy(&p->p_realtimer, &exp->p_realtimer,sizeof(struct itimerval));
        bcopy(&p->p_rtime, &exp->p_rtime,sizeof(struct timeval));
-       exp->p_uticks  = p->p_uticks ;
-       exp->p_sticks  = p->p_sticks ;
-       exp->p_iticks  = p->p_iticks ;
-       exp->p_traceflag  = p->p_traceflag ;
-       exp->p_tracep  = p->p_tracep ;
+       exp->p_uticks  = 0 ;
+       exp->p_sticks  = 0 ;
+       exp->p_iticks  = 0 ;
+       exp->p_traceflag  = 0;
+       exp->p_tracep  = 0 ;
+       exp->p_siglist  = 0 ;   /* No longer relevant */
+       exp->p_textvp  = CAST_DOWN_EXPLICIT(uint32_t,p->p_textvp) ;
+       exp->p_holdcnt = 0 ;
+       exp->p_sigmask  = 0 ;   /* no longer avaialable */
+       exp->p_sigignore  = p->p_sigignore ;
+       exp->p_sigcatch  = p->p_sigcatch ;
+       exp->p_priority  = p->p_priority ;
+       exp->p_usrpri  = 0 ;
+       exp->p_nice  = p->p_nice ;
+       bcopy(&p->p_comm, &exp->p_comm,MAXCOMLEN);
+       exp->p_comm[MAXCOMLEN] = '\0';
+       exp->p_pgrp  = CAST_DOWN_EXPLICIT(uint32_t,p->p_pgrp) ;
+       exp->p_addr  = 0;
+       exp->p_xstat  = p->p_xstat ;
+       exp->p_acflag  = p->p_acflag ;
+       exp->p_ru  = CAST_DOWN_EXPLICIT(uint32_t,p->p_ru) ;             /* XXX may be NULL */
+}
+
+/*
+ * Fill in an LP64 version of extern_proc structure for the specified process.
+ */
+static void
+fill_user64_externproc(proc_t p, struct user64_extern_proc *exp)
+{
+       exp->p_forw = exp->p_back = USER_ADDR_NULL;
+       exp->p_starttime.tv_sec = p->p_start.tv_sec;
+       exp->p_starttime.tv_usec = p->p_start.tv_usec;
+       exp->p_vmspace = USER_ADDR_NULL;
+       exp->p_sigacts = CAST_USER_ADDR_T(p->p_sigacts);
+       exp->p_flag  = p->p_flag;
+       if (p->p_lflag & P_LTRACED)
+               exp->p_flag |= P_TRACED;
+       if (p->p_lflag & P_LPPWAIT)
+               exp->p_flag |= P_PPWAIT;
+       if (p->p_lflag & P_LEXIT)
+               exp->p_flag |= P_WEXIT;
+       exp->p_stat  = p->p_stat ;
+       exp->p_pid  = p->p_pid ;
+       exp->p_oppid  = p->p_oppid ;
+       /* Mach related  */
+       exp->user_stack  = p->user_stack;
+       exp->exit_thread  = CAST_USER_ADDR_T(p->exit_thread);
+       exp->p_debugger  = p->p_debugger ;
+       exp->sigwait  = p->sigwait ;
+       /* scheduling */
+#ifdef _PROC_HAS_SCHEDINFO_
+       exp->p_estcpu  = p->p_estcpu ;
+       exp->p_pctcpu  = p->p_pctcpu ;
+       exp->p_slptime  = p->p_slptime ;
+#else
+       exp->p_estcpu  = 0 ;
+       exp->p_pctcpu  = 0 ;
+       exp->p_slptime = 0 ;
+#endif
+       exp->p_cpticks  = 0 ;
+       exp->p_wchan  = 0;
+       exp->p_wmesg  = 0;
+       exp->p_swtime  = 0 ;
+       exp->p_realtimer.it_interval.tv_sec = p->p_realtimer.it_interval.tv_sec;
+       exp->p_realtimer.it_interval.tv_usec = p->p_realtimer.it_interval.tv_usec;
+       exp->p_realtimer.it_value.tv_sec = p->p_realtimer.it_value.tv_sec;
+       exp->p_realtimer.it_value.tv_usec = p->p_realtimer.it_value.tv_usec;
+       exp->p_rtime.tv_sec = p->p_rtime.tv_sec;
+       exp->p_rtime.tv_usec = p->p_rtime.tv_usec;
+       exp->p_uticks  = 0 ;
+       exp->p_sticks  = 0 ;
+       exp->p_iticks  = 0 ;
+       exp->p_traceflag  = 0 ;
+       exp->p_tracep  = 0;
        exp->p_siglist  = 0 ;   /* No longer relevant */
-       exp->p_textvp  = p->p_textvp ;
+       exp->p_textvp  = CAST_USER_ADDR_T(p->p_textvp);
        exp->p_holdcnt = 0 ;
        exp->p_sigmask  = 0 ;   /* no longer avaialable */
        exp->p_sigignore  = p->p_sigignore ;
        exp->p_sigcatch  = p->p_sigcatch ;
        exp->p_priority  = p->p_priority ;
-       exp->p_usrpri  = p->p_usrpri ;
+       exp->p_usrpri  = 0 ;
        exp->p_nice  = p->p_nice ;
        bcopy(&p->p_comm, &exp->p_comm,MAXCOMLEN);
        exp->p_comm[MAXCOMLEN] = '\0';
-       exp->p_pgrp  = p->p_pgrp ;
-       exp->p_addr  = NULL;
+       exp->p_pgrp  = CAST_USER_ADDR_T(p->p_pgrp);
+       exp->p_addr  = USER_ADDR_NULL;
        exp->p_xstat  = p->p_xstat ;
        exp->p_acflag  = p->p_acflag ;
-       exp->p_ru  = p->p_ru ;
+       exp->p_ru  = CAST_USER_ADDR_T(p->p_ru);         /* XXX may be NULL */
+}
+
+static void
+fill_user32_proc(proc_t p, struct user32_kinfo_proc *kp)
+{
+       /* on a 64 bit kernel, 32 bit users will get some truncated information */
+       fill_user32_externproc(p, &kp->kp_proc);
+       fill_user32_eproc(p, &kp->kp_eproc);
 }
 
 static void
-fill_proc(p, kp)
-       register struct proc *p;
-       register struct kinfo_proc *kp;
+fill_user64_proc(proc_t p, struct user64_kinfo_proc *kp)
 {
-       fill_externproc(p, &kp->kp_proc);
-       fill_eproc(p, &kp->kp_eproc);
+       fill_user64_externproc(p, &kp->kp_proc);
+       fill_user64_eproc(p, &kp->kp_eproc);
 }
 
 int
-kdebug_ops(name, namelen, where, sizep, p)
-int *name;
-u_int namelen;
-char *where;
-size_t *sizep;
-struct proc *p;
-{
-       int size=*sizep;
+kdebug_ops(int *name, u_int namelen, user_addr_t where, 
+           size_t *sizep, proc_t p)
+{
        int ret=0;
-       extern int kdbg_control(int *name, u_int namelen,
-               char * where,size_t * sizep);
 
-       if (ret = suser(p->p_ucred, &p->p_acflag))
+       if (namelen == 0)
+               return(ENOTSUP);
+       
+    ret = suser(kauth_cred_get(), &p->p_acflag);
+       if (ret)
                return(ret);
-
+       
        switch(name[0]) {
        case KERN_KDEFLAGS:
        case KERN_KDDFLAGS:
@@ -1160,100 +1696,63 @@ struct proc *p;
                ret = kdbg_control(name, namelen, where, sizep);
                break;
        default:
-               ret= EOPNOTSUPP;
+               ret= ENOTSUP;
                break;
        }
        return(ret);
 }
 
-int
-pcsamples_ops(name, namelen, where, sizep, p)
-int *name;
-u_int namelen;
-char *where;
-size_t *sizep;
-struct proc *p;
-{
-       int ret=0;
-       extern int pcsamples_control(int *name, u_int namelen,
-               char * where,size_t * sizep);
-
-       if (ret = suser(p->p_ucred, &p->p_acflag))
-               return(ret);
-
-       switch(name[0]) {
-       case KERN_PCDISABLE:
-       case KERN_PCGETBUF:
-       case KERN_PCSETUP:
-       case KERN_PCREMOVE:
-       case KERN_PCREADBUF:
-       case KERN_PCSETREG:
-       case KERN_PCSETBUF:
-       case KERN_PCCOMM:
-               ret = pcsamples_control(name, namelen, where, sizep);
-               break;
-       default:
-               ret= EOPNOTSUPP;
-               break;
-       }
-       return(ret);
-}
 
 /*
  * Return the top *sizep bytes of the user stack, or the entire area of the
  * user stack down through the saved exec_path, whichever is smaller.
  */
 int
-sysctl_procargs(name, namelen, where, sizep, cur_proc)
-       int *name;
-       u_int namelen;
-       char *where;
-       size_t *sizep;
-       struct proc *cur_proc;
+sysctl_procargs(int *name, u_int namelen, user_addr_t where, 
+                size_t *sizep, proc_t cur_proc)
 {
        return sysctl_procargsx( name, namelen, where, sizep, cur_proc, 0);
 }
 
 static int
-sysctl_procargs2(name, namelen, where, sizep, cur_proc)
-       int *name;
-       u_int namelen;
-       char *where;
-       size_t *sizep;
-       struct proc *cur_proc;
+sysctl_procargs2(int *name, u_int namelen, user_addr_t where, 
+                 size_t *sizep, proc_t cur_proc)
 {
        return sysctl_procargsx( name, namelen, where, sizep, cur_proc, 1);
 }
 
 static int
-sysctl_procargsx(name, namelen, where, sizep, cur_proc, argc_yes)
-       int *name;
-       u_int namelen;
-       char *where;
-       size_t *sizep;
-       struct proc *cur_proc;
-       int argc_yes;
-{
-       register struct proc *p;
-       register int needed = 0;
-       int buflen = where != NULL ? *sizep : 0;
+sysctl_procargsx(int *name, u_int namelen, user_addr_t where, 
+                 size_t *sizep, proc_t cur_proc, int argc_yes)
+{
+       proc_t p;
+       int buflen = where != USER_ADDR_NULL ? *sizep : 0;
        int error = 0;
-       struct vm_map *proc_map;
+       struct _vm_map *proc_map;
        struct task * task;
        vm_map_copy_t   tmp;
-       vm_offset_t     arg_addr;
-       vm_size_t       arg_size;
+       user_addr_t     arg_addr;
+       size_t          arg_size;
        caddr_t data;
-       unsigned size;
+       size_t argslen=0;
+       int size;
        vm_offset_t     copy_start, copy_end;
-       int             *ip;
        kern_return_t ret;
        int pid;
+       kauth_cred_t my_cred;
+       uid_t uid;
 
+       if ( namelen < 1 )
+               return(EINVAL);
+       
        if (argc_yes)
-               buflen -= NBPW;         /* reserve first word to return argc */
+               buflen -= sizeof(int);          /* reserve first word to return argc */
 
-       if ((buflen <= 0) || (buflen > ARG_MAX)) {
+       /* we only care about buflen when where (oldp from sysctl) is not NULL. */
+       /* when where (oldp from sysctl) is NULL and sizep (oldlenp from sysctl */
+       /* is not NULL then the caller wants us to return the length needed to */
+       /* hold the data we would return */ 
+       if (where != USER_ADDR_NULL && (buflen <= 0 || buflen > ARG_MAX)) {
                return(EINVAL);
        }
        arg_size = buflen;
@@ -1262,9 +1761,7 @@ sysctl_procargsx(name, namelen, where, sizep, cur_proc, argc_yes)
         *      Lookup process by pid
         */
        pid = name[0];
-
- restart:
-       p = pfind(pid);
+       p = proc_find(pid);
        if (p == NULL) {
                return(EINVAL);
        }
@@ -1279,13 +1776,49 @@ sysctl_procargsx(name, namelen, where, sizep, cur_proc, argc_yes)
         *      size.
         */
 
-       if (!p->user_stack)
+       if (!p->user_stack) {
+               proc_rele(p);
                return(EINVAL);
+       }
+
+       if (where == USER_ADDR_NULL) {
+               /* caller only wants to know length of proc args data */
+               if (sizep == NULL) {
+                       proc_rele(p);
+                       return(EFAULT);
+               }
+                       
+                size = p->p_argslen;
+               proc_rele(p);
+                if (argc_yes) {
+                       size += sizeof(int);
+                }
+                else {
+                       /*
+                        * old PROCARGS will return the executable's path and plus some
+                        * extra space for work alignment and data tags
+                        */
+                       size += PATH_MAX + (6 * sizeof(int));
+                }
+               size += (size & (sizeof(int) - 1)) ? (sizeof(int) - (size & (sizeof(int) - 1))) : 0;
+               *sizep = size;
+               return (0);
+       }
+       
+       my_cred = kauth_cred_proc_ref(p);
+       uid = kauth_cred_getuid(my_cred);
+       kauth_cred_unref(&my_cred);
 
-       if ((p->p_ucred->cr_uid != cur_proc->p_ucred->cr_uid) 
-               && suser(cur_proc->p_ucred, &cur_proc->p_acflag))
+       if ((uid != kauth_cred_getuid(kauth_cred_get())) 
+               && suser(kauth_cred_get(), &cur_proc->p_acflag)) {
+               proc_rele(p);
                return (EINVAL);
-       arg_addr = (vm_offset_t)(p->user_stack - arg_size);
+       }
+
+       if ((u_int)arg_size > p->p_argslen)
+               arg_size = round_page(p->p_argslen);
+
+       arg_addr = p->user_stack - arg_size;
 
 
        /*
@@ -1294,34 +1827,41 @@ sysctl_procargsx(name, namelen, where, sizep, cur_proc, argc_yes)
         *      that by getting a reference on the task itself.
         */
        task = p->task;
-       if (task == NULL)
+       if (task == NULL) {
+               proc_rele(p);
                return(EINVAL);
+       }
        
+       argslen = p->p_argslen;
        /*
-        * A regular task_reference call can block, causing the funnel
-        * to be dropped and allowing the proc/task to get freed.
-        * Instead, we issue a non-blocking attempt at the task reference,
-        * and look up the proc/task all over again if that fails.
+        * Once we have a task reference we can convert that into a
+        * map reference, which we will use in the calls below.  The
+        * task/process may change its map after we take this reference
+        * (see execve), but the worst that will happen then is a return
+        * of stale info (which is always a possibility).
         */
-       if (!task_reference_try(task)) {
-               mutex_pause();
-               goto restart;
-       }
+       task_reference(task);
+       proc_rele(p);
+       proc_map = get_task_map_reference(task);
+       task_deallocate(task);
+       
+       if (proc_map == NULL)
+               return(EINVAL);
 
-       ret = kmem_alloc(kernel_map, &copy_start, round_page_32(arg_size));
+
+       ret = kmem_alloc(kernel_map, &copy_start, round_page(arg_size));
        if (ret != KERN_SUCCESS) {
-               task_deallocate(task);
+               vm_map_deallocate(proc_map);
                return(ENOMEM);
        }
 
-       proc_map = get_task_map(task);
-       copy_end = round_page_32(copy_start + arg_size);
+       copy_end = round_page(copy_start + arg_size);
 
-       if( vm_map_copyin(proc_map, trunc_page(arg_addr), round_page_32(arg_size)
-                       FALSE, &tmp) != KERN_SUCCESS) {
-                       task_deallocate(task);
+       if( vm_map_copyin(proc_map, (vm_map_address_t)arg_addr
+                         (vm_map_size_t)arg_size, FALSE, &tmp) != KERN_SUCCESS) {
+                       vm_map_deallocate(proc_map);
                        kmem_free(kernel_map, copy_start,
-                                       round_page_32(arg_size));
+                                       round_page(arg_size));
                        return (EIO);
        }
 
@@ -1329,28 +1869,29 @@ sysctl_procargsx(name, namelen, where, sizep, cur_proc, argc_yes)
         *      Now that we've done the copyin from the process'
         *      map, we can release the reference to it.
         */
-       task_deallocate(task);
+       vm_map_deallocate(proc_map);
 
-       if( vm_map_copy_overwrite(kernel_map, copy_start, 
-               tmp, FALSE) != KERN_SUCCESS) {
+       if( vm_map_copy_overwrite(kernel_map, 
+                                 (vm_map_address_t)copy_start, 
+                                 tmp, FALSE) != KERN_SUCCESS) {
                        kmem_free(kernel_map, copy_start,
-                                       round_page_32(arg_size));
+                                       round_page(arg_size));
                        return (EIO);
        }
 
-       data = (caddr_t) (copy_end - arg_size);
-
-       if (buflen > p->p_argslen) {
-               data = &data[buflen - p->p_argslen];
-               size = p->p_argslen;
+       if (arg_size > argslen) {
+               data = (caddr_t) (copy_end - argslen);
+               size = argslen;
        } else {
-               size = buflen;
+               data = (caddr_t) (copy_end - arg_size);
+               size = arg_size;
        }
 
        if (argc_yes) {
                /* Put processes argc as the first word in the copyout buffer */
                suword(where, p->p_argc);
-               error = copyout(data, where + NBPW, size);
+               error = copyout(data, (where + sizeof(int)), size);
+               size += sizeof(int);
        } else {
                error = copyout(data, where, size);
 
@@ -1362,14 +1903,13 @@ sysctl_procargsx(name, namelen, where, sizep, cur_proc, argc_yes)
                 * 
                 * Note: we keep all pointers&sizes aligned to word boundries
                 */
-
-               if ( (! error) && (buflen > p->p_argslen) )
+               if ( (! error) && (buflen > 0 && (u_int)buflen > argslen) )
                {
-                       int binPath_sz;
+                       int binPath_sz, alignedBinPath_sz = 0;
                        int extraSpaceNeeded, addThis;
-                       char * placeHere;
+                       user_addr_t placeHere;
                        char * str = (char *) data;
-                       unsigned int max_len = size;
+                       int max_len = size;
 
                        /* Some apps are really bad about messing up their stacks
                           So, we have to be extra careful about getting the length
@@ -1384,31 +1924,32 @@ sysctl_procargsx(name, namelen, where, sizep, cur_proc, argc_yes)
                        while ( (binPath_sz < max_len-1) && (*str++ != 0) )
                                binPath_sz++;
 
+                       /* If we have a NUL terminator, copy it, too */
                        if (binPath_sz < max_len-1) binPath_sz += 1;
 
                        /* Pre-Flight the space requiremnts */
 
                        /* Account for the padding that fills out binPath to the next word */
-                       binPath_sz += (binPath_sz & (NBPW-1)) ? (NBPW-(binPath_sz & (NBPW-1))) : 0;
+                       alignedBinPath_sz += (binPath_sz & (sizeof(int)-1)) ? (sizeof(int)-(binPath_sz & (sizeof(int)-1))) : 0;
 
                        placeHere = where + size;
 
                        /* Account for the bytes needed to keep placeHere word aligned */ 
-                       addThis = ((unsigned long)placeHere & (NBPW-1)) ? (NBPW-((unsigned long)placeHere & (NBPW-1))) : 0;
+                       addThis = (placeHere & (sizeof(int)-1)) ? (sizeof(int)-(placeHere & (sizeof(int)-1))) : 0;
 
                        /* Add up all the space that is needed */
-                       extraSpaceNeeded = binPath_sz + addThis + (4 * NBPW);
+                       extraSpaceNeeded = alignedBinPath_sz + addThis + binPath_sz + (4 * sizeof(int));
 
                        /* is there is room to tack on argv[0]? */
-                       if ( (buflen & ~(NBPW-1)) >= ( p->p_argslen + extraSpaceNeeded ))
+                       if ( (buflen & ~(sizeof(int)-1)) >= ( argslen + extraSpaceNeeded ))
                        {
                                placeHere += addThis;
                                suword(placeHere, 0);
-                               placeHere += NBPW;
+                               placeHere += sizeof(int);
                                suword(placeHere, 0xBFFF0000);
-                               placeHere += NBPW;
+                               placeHere += sizeof(int);
                                suword(placeHere, 0);
-                               placeHere += NBPW;
+                               placeHere += sizeof(int);
                                error = copyout(data, placeHere, binPath_sz);
                                if ( ! error )
                                {
@@ -1427,201 +1968,900 @@ sysctl_procargsx(name, namelen, where, sizep, cur_proc, argc_yes)
                return(error);
        }
 
-       if (where != NULL)
+       if (where != USER_ADDR_NULL)
                *sizep = size;
        return (0);
 }
 
 
 /*
- * Validate parameters and get old / set new parameters
- * for max number of concurrent aio requests.  Makes sure
- * the system wide limit is greater than the per process
- * limit.
+ * Max number of concurrent aio requests
  */
 static int
-sysctl_aiomax( void *oldp, size_t *oldlenp, void *newp, size_t newlen )
+sysctl_aiomax
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
 {
-       int     error = 0;
-       int             new_value;
-
-       if ( oldp && *oldlenp < sizeof(int) )
-               return (ENOMEM);
-       if ( newp && newlen != sizeof(int) )
-               return (EINVAL);
-               
-       *oldlenp = sizeof(int);
-       if ( oldp )
-               error = copyout( &aio_max_requests, oldp, sizeof(int) );
-       if ( error == 0 && newp )
-               error = copyin( newp, &new_value, sizeof(int) );
-       if ( error == 0 && newp ) {
-               if ( new_value >= aio_max_requests_per_process )
+       int new_value, changed;
+       int error = sysctl_io_number(req, aio_max_requests, sizeof(int), &new_value, &changed);
+       if (changed) {
+                /* make sure the system-wide limit is greater than the per process limit */
+               if (new_value >= aio_max_requests_per_process)
                        aio_max_requests = new_value;
                else
                        error = EINVAL;
        }
-       return( error );
-       
-} /* sysctl_aiomax */
+       return(error);
+}
 
 
 /*
- * Validate parameters and get old / set new parameters
- * for max number of concurrent aio requests per process.  
- * Makes sure per process limit is less than the system wide
- * limit.
+ * Max number of concurrent aio requests per process
  */
 static int
-sysctl_aioprocmax( void *oldp, size_t *oldlenp, void *newp, size_t newlen )
+sysctl_aioprocmax
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
 {
-       int     error = 0;
-       int             new_value = 0;
-
-       if ( oldp && *oldlenp < sizeof(int) )
-               return (ENOMEM);
-       if ( newp && newlen != sizeof(int) )
-               return (EINVAL);
-               
-       *oldlenp = sizeof(int);
-       if ( oldp )
-               error = copyout( &aio_max_requests_per_process, oldp, sizeof(int) );
-       if ( error == 0 && newp )
-               error = copyin( newp, &new_value, sizeof(int) );
-       if ( error == 0 && newp ) {
-               if ( new_value <= aio_max_requests && new_value >= AIO_LISTIO_MAX )
+       int new_value, changed;
+       int error = sysctl_io_number(req, aio_max_requests_per_process, sizeof(int), &new_value, &changed);
+       if (changed) {
+               /* make sure per process limit is less than the system-wide limit */
+               if (new_value <= aio_max_requests && new_value >= AIO_LISTIO_MAX)
                        aio_max_requests_per_process = new_value;
                else
                        error = EINVAL;
        }
-       return( error );
-       
-} /* sysctl_aioprocmax */
+       return(error);
+}
 
 
 /*
- * Validate parameters and get old / set new parameters
- * for max number of async IO worker threads.  
- * We only allow an increase in the number of worker threads.
+ * Max number of async IO worker threads
  */
 static int
-sysctl_aiothreads( void *oldp, size_t *oldlenp, void *newp, size_t newlen )
+sysctl_aiothreads
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
 {
-       int     error = 0;
-       int             new_value;
-
-       if ( oldp && *oldlenp < sizeof(int) )
-               return (ENOMEM);
-       if ( newp && newlen != sizeof(int) )
-               return (EINVAL);
-               
-       *oldlenp = sizeof(int);
-       if ( oldp )
-               error = copyout( &aio_worker_threads, oldp, sizeof(int) );
-       if ( error == 0 && newp )
-               error = copyin( newp, &new_value, sizeof(int) );
-       if ( error == 0 && newp ) {
+       int new_value, changed;
+       int error = sysctl_io_number(req, aio_worker_threads, sizeof(int), &new_value, &changed);
+       if (changed) {
+               /* we only allow an increase in the number of worker threads */
                if (new_value > aio_worker_threads ) {
-                       _aio_create_worker_threads( (new_value - aio_worker_threads) );
+                       _aio_create_worker_threads((new_value - aio_worker_threads));
                        aio_worker_threads = new_value;
                }
                else
                        error = EINVAL;
        }
-       return( error );
-       
-} /* sysctl_aiothreads */
+       return(error);
+}
 
 
 /*
- * Validate parameters and get old / set new parameters
- * for max number of processes per UID.
- * Makes sure per UID limit is less than the system wide limit.
+ * System-wide limit on the max number of processes
  */
 static int
-sysctl_maxprocperuid( void *oldp, size_t *oldlenp, void *newp, size_t newlen )
+sysctl_maxproc
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
 {
-       int     error = 0;
-       int             new_value;
-
-       if ( oldp != NULL && *oldlenp < sizeof(int) )
-               return (ENOMEM);
-       if ( newp != NULL && newlen != sizeof(int) )
-               return (EINVAL);
-               
-       *oldlenp = sizeof(int);
-       if ( oldp != NULL )
-               error = copyout( &maxprocperuid, oldp, sizeof(int) );
-       if ( error == 0 && newp != NULL ) {
-               error = copyin( newp, &new_value, sizeof(int) );
-               if ( error == 0 && new_value <= maxproc && new_value > 0 )
-                       maxprocperuid = new_value;
+       int new_value, changed;
+       int error = sysctl_io_number(req, maxproc, sizeof(int), &new_value, &changed);
+       if (changed) {
+               AUDIT_ARG(value32, new_value);
+               /* make sure the system-wide limit is less than the configured hard
+                  limit set at kernel compilation */
+               if (new_value <= hard_maxproc && new_value > 0)
+                       maxproc = new_value;
                else
                        error = EINVAL;
        }
-       return( error );
-       
-} /* sysctl_maxprocperuid */
-
+       return(error);
+}
 
-/*
- * Validate parameters and get old / set new parameters
- * for max number of files per process.
- * Makes sure per process limit is less than the system-wide limit.
- */
-static int
-sysctl_maxfilesperproc( void *oldp, size_t *oldlenp, void *newp, size_t newlen )
+SYSCTL_STRING(_kern, KERN_OSTYPE, ostype, 
+               CTLFLAG_RD | CTLFLAG_KERN, 
+               ostype, 0, "");
+SYSCTL_STRING(_kern, KERN_OSRELEASE, osrelease, 
+               CTLFLAG_RD | CTLFLAG_KERN, 
+               osrelease, 0, "");
+SYSCTL_INT(_kern, KERN_OSREV, osrevision, 
+               CTLFLAG_RD | CTLFLAG_KERN, 
+               (int *)NULL, BSD, "");
+SYSCTL_STRING(_kern, KERN_VERSION, version, 
+               CTLFLAG_RD | CTLFLAG_KERN, 
+               version, 0, "");
+
+#if DEBUG
+int debug_kprint_syscall = 0;
+char debug_kprint_syscall_process[MAXCOMLEN+1];
+
+SYSCTL_INT (_debug, OID_AUTO, kprint_syscall,
+           CTLFLAG_RW, &debug_kprint_syscall, 0, "kprintf syscall tracing");
+SYSCTL_STRING(_debug, OID_AUTO, kprint_syscall_process, 
+                         CTLFLAG_RW, debug_kprint_syscall_process, sizeof(debug_kprint_syscall_process),
+                         "name of process for kprintf syscall tracing");
+
+int debug_kprint_current_process(const char **namep)
 {
-       int     error = 0;
-       int             new_value;
+       struct proc *p = current_proc();
 
-       if ( oldp != NULL && *oldlenp < sizeof(int) )
-               return (ENOMEM);
-       if ( newp != NULL && newlen != sizeof(int) )
-               return (EINVAL);
-               
-       *oldlenp = sizeof(int);
-       if ( oldp != NULL )
-               error = copyout( &maxfilesperproc, oldp, sizeof(int) );
-       if ( error == 0 && newp != NULL ) {
-               error = copyin( newp, &new_value, sizeof(int) );
-               if ( error == 0 && new_value < maxfiles && new_value > 0 )
-                       maxfilesperproc = new_value;
-               else
-                       error = EINVAL;
+       if (p == NULL) {
+               return 0;
        }
-       return( error );
-       
-} /* sysctl_maxfilesperproc */
 
+       if (debug_kprint_syscall_process[0]) {
+               /* user asked to scope tracing to a particular process name */
+               if(0 == strncmp(debug_kprint_syscall_process,
+                                               p->p_comm, sizeof(debug_kprint_syscall_process))) {
+                       /* no value in telling the user that we traced what they asked */
+                       if(namep) *namep = NULL;
+
+                       return 1;
+               } else {
+                       return 0;
+               }
+       }
+
+       /* trace all processes. Tell user what we traced */
+       if (namep) {
+               *namep = p->p_comm;
+       }
+
+       return 1;
+}
+#endif
+
+/* PR-5293665: need to use a callback function for kern.osversion to set
+ * osversion in IORegistry */
 
-/*
- * Validate parameters and get old / set new parameters
- * for the system-wide limit on the max number of processes.
- * Makes sure the system-wide limit is less than the configured hard
- * limit set at kernel compilation.
- */
 static int
-sysctl_maxproc( void *oldp, size_t *oldlenp, void *newp, size_t newlen )
+sysctl_osversion(__unused struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req)
 {
-       int     error = 0;
-       int     new_value;
+    int rval = 0;
 
-       if ( oldp != NULL && *oldlenp < sizeof(int) )
-               return (ENOMEM);
-       if ( newp != NULL && newlen != sizeof(int) )
-               return (EINVAL);
-               
-       *oldlenp = sizeof(int);
-       if ( oldp != NULL )
-               error = copyout( &maxproc, oldp, sizeof(int) );
-       if ( error == 0 && newp != NULL ) {
-               error = copyin( newp, &new_value, sizeof(int) );
-               if ( error == 0 && new_value <= hard_maxproc && new_value > 0 )
-                       maxproc = new_value;
-               else
+    rval = sysctl_handle_string(oidp, arg1, arg2, req);
+
+    if (req->newptr) {
+        IORegistrySetOSBuildVersion((char *)arg1); 
+    }
+
+    return rval;
+}
+
+SYSCTL_PROC(_kern, KERN_OSVERSION, osversion,
+        CTLFLAG_RW | CTLFLAG_KERN | CTLTYPE_STRING,
+        osversion, 256 /* OSVERSIZE*/, 
+        sysctl_osversion, "A", "");
+
+static int
+sysctl_sysctl_bootargs
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       int error;
+       char buf[256];
+
+       strlcpy(buf, PE_boot_args(), 256);
+       error = sysctl_io_string(req, buf, 256, 0, NULL);
+       return(error);
+}
+
+SYSCTL_PROC(_kern, OID_AUTO, bootargs,
+       CTLFLAG_LOCKED | CTLFLAG_RD | CTLFLAG_KERN | CTLTYPE_STRING,
+       NULL, 0,
+       sysctl_sysctl_bootargs, "A", "bootargs");
+
+SYSCTL_INT(_kern, KERN_MAXFILES, maxfiles, 
+               CTLFLAG_RW | CTLFLAG_KERN, 
+               &maxfiles, 0, "");
+SYSCTL_INT(_kern, KERN_ARGMAX, argmax, 
+               CTLFLAG_RD | CTLFLAG_KERN, 
+               (int *)NULL, ARG_MAX, "");
+SYSCTL_INT(_kern, KERN_POSIX1, posix1version, 
+               CTLFLAG_RD | CTLFLAG_KERN, 
+               (int *)NULL, _POSIX_VERSION, "");
+SYSCTL_INT(_kern, KERN_NGROUPS, ngroups, 
+               CTLFLAG_RD | CTLFLAG_KERN, 
+               (int *)NULL, NGROUPS_MAX, "");
+SYSCTL_INT(_kern, KERN_JOB_CONTROL, job_control, 
+               CTLFLAG_RD | CTLFLAG_KERN, 
+               (int *)NULL, 1, "");
+#if 1  /* _POSIX_SAVED_IDS from <unistd.h> */
+SYSCTL_INT(_kern, KERN_SAVED_IDS, saved_ids, 
+               CTLFLAG_RD | CTLFLAG_KERN, 
+               (int *)NULL, 1, "");
+#else
+SYSCTL_INT(_kern, KERN_SAVED_IDS, saved_ids, 
+               CTLFLAG_RD | CTLFLAG_KERN, 
+               NULL, 0, "");
+#endif
+SYSCTL_INT(_kern, OID_AUTO, num_files, 
+               CTLFLAG_RD, 
+               &nfiles, 0, "");
+SYSCTL_COMPAT_INT(_kern, OID_AUTO, num_vnodes, 
+               CTLFLAG_RD, 
+               &numvnodes, 0, "");
+SYSCTL_INT(_kern, OID_AUTO, num_tasks, 
+               CTLFLAG_RD, 
+               &task_max, 0, "");
+SYSCTL_INT(_kern, OID_AUTO, num_threads, 
+               CTLFLAG_RD, 
+               &thread_max, 0, "");
+SYSCTL_INT(_kern, OID_AUTO, num_taskthreads, 
+               CTLFLAG_RD, 
+               &task_threadmax, 0, "");
+
+static int
+sysctl_maxvnodes (__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       int oldval = desiredvnodes;
+       int error = sysctl_io_number(req, desiredvnodes, sizeof(int), &desiredvnodes, NULL);
+
+       if (oldval != desiredvnodes) {
+               reset_vmobjectcache(oldval, desiredvnodes);
+               resize_namecache(desiredvnodes);
+       }
+
+       return(error);
+}
+
+SYSCTL_PROC(_kern, KERN_MAXVNODES, maxvnodes,
+               CTLTYPE_INT | CTLFLAG_RW,
+               0, 0, sysctl_maxvnodes, "I", "");
+
+SYSCTL_PROC(_kern, KERN_MAXPROC, maxproc,
+               CTLTYPE_INT | CTLFLAG_RW,
+               0, 0, sysctl_maxproc, "I", "");
+
+SYSCTL_PROC(_kern, KERN_AIOMAX, aiomax,
+               CTLTYPE_INT | CTLFLAG_RW,
+               0, 0, sysctl_aiomax, "I", "");
+
+SYSCTL_PROC(_kern, KERN_AIOPROCMAX, aioprocmax,
+               CTLTYPE_INT | CTLFLAG_RW,
+               0, 0, sysctl_aioprocmax, "I", "");
+
+SYSCTL_PROC(_kern, KERN_AIOTHREADS, aiothreads,
+               CTLTYPE_INT | CTLFLAG_RW,
+               0, 0, sysctl_aiothreads, "I", "");
+
+static int
+sysctl_securelvl
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       int new_value, changed;
+       int error = sysctl_io_number(req, securelevel, sizeof(int), &new_value, &changed);
+       if (changed) {
+               if (!(new_value < securelevel && req->p->p_pid != 1)) {
+                       proc_list_lock();
+                       securelevel = new_value;
+                       proc_list_unlock();
+               } else {
+                       error = EPERM;
+               }
+       }
+       return(error);
+}
+
+SYSCTL_PROC(_kern, KERN_SECURELVL, securelevel,
+               CTLTYPE_INT | CTLFLAG_RW,
+               0, 0, sysctl_securelvl, "I", "");
+
+
+static int
+sysctl_domainname
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       int error, changed;
+       error = sysctl_io_string(req, domainname, sizeof(domainname), 0, &changed);
+       if (changed) {
+               domainnamelen = strlen(domainname);
+       }
+       return(error);
+}
+
+SYSCTL_PROC(_kern, KERN_DOMAINNAME, nisdomainname,
+               CTLTYPE_STRING | CTLFLAG_RW,
+               0, 0, sysctl_domainname, "A", "");
+
+SYSCTL_COMPAT_INT(_kern, KERN_HOSTID, hostid, 
+               CTLFLAG_RW | CTLFLAG_KERN, 
+               &hostid, 0, "");
+
+static int
+sysctl_hostname
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       int error, changed;
+       error = sysctl_io_string(req, hostname, sizeof(hostname), 1, &changed);
+       if (changed) {
+               hostnamelen = req->newlen;
+       }
+       return(error);
+}
+
+
+SYSCTL_PROC(_kern, KERN_HOSTNAME, hostname,
+               CTLTYPE_STRING | CTLFLAG_RW,
+               0, 0, sysctl_hostname, "A", "");
+
+static int
+sysctl_procname
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       /* Original code allowed writing, I'm copying this, although this all makes
+          no sense to me. Besides, this sysctl is never used. */
+       return sysctl_io_string(req, &req->p->p_name[0], (2*MAXCOMLEN+1), 1, NULL);
+}
+
+SYSCTL_PROC(_kern, KERN_PROCNAME, procname,
+               CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_ANYBODY,
+               0, 0, sysctl_procname, "A", "");
+
+SYSCTL_INT(_kern, KERN_SPECULATIVE_READS, speculative_reads_disabled, 
+               CTLFLAG_RW | CTLFLAG_KERN, 
+               &speculative_reads_disabled, 0, "");
+
+SYSCTL_UINT(_kern, OID_AUTO, preheat_pages_max, 
+               CTLFLAG_RW | CTLFLAG_KERN, 
+               &preheat_pages_max, 0, "");
+
+SYSCTL_UINT(_kern, OID_AUTO, preheat_pages_min, 
+               CTLFLAG_RW | CTLFLAG_KERN, 
+               &preheat_pages_min, 0, "");
+
+SYSCTL_UINT(_kern, OID_AUTO, preheat_pages_mult, 
+               CTLFLAG_RW | CTLFLAG_KERN, 
+               &preheat_pages_mult, 0, "");
+
+static int
+sysctl_boottime
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       time_t tv_sec = boottime_sec();
+       struct proc *p = req->p;
+
+       if (proc_is64bit(p)) {
+               struct user64_timeval t;
+               t.tv_sec = tv_sec;
+               t.tv_usec = 0;
+               return sysctl_io_opaque(req, &t, sizeof(t), NULL);
+       } else {
+               struct user32_timeval t;
+               t.tv_sec = tv_sec;
+               t.tv_usec = 0;
+               return sysctl_io_opaque(req, &t, sizeof(t), NULL);
+       }
+}
+
+SYSCTL_PROC(_kern, KERN_BOOTTIME, boottime,
+               CTLTYPE_STRUCT | CTLFLAG_RD,
+               0, 0, sysctl_boottime, "S,timeval", "");
+
+static int
+sysctl_symfile
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       char *str;
+       int error = get_kernel_symfile(req->p, &str);
+       if (error)
+               return (error);
+       return sysctl_io_string(req, str, 0, 0, NULL);
+}
+
+
+SYSCTL_PROC(_kern, KERN_SYMFILE, symfile,
+               CTLTYPE_STRING | CTLFLAG_RD,
+               0, 0, sysctl_symfile, "A", "");
+
+#if NFSCLIENT
+static int
+sysctl_netboot
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       return sysctl_io_number(req, netboot_root(), sizeof(int), NULL, NULL);
+}
+
+SYSCTL_PROC(_kern, KERN_NETBOOT, netboot,
+               CTLTYPE_INT | CTLFLAG_RD,
+               0, 0, sysctl_netboot, "I", "");
+#endif
+
+#ifdef CONFIG_IMGSRC_ACCESS
+static int
+sysctl_imgsrcdev 
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       vfs_context_t ctx = vfs_context_current();
+       vnode_t devvp;
+       int result;
+
+       if (!vfs_context_issuser(ctx)) {
+               return EPERM;
+       }    
+
+       if (imgsrc_rootvnode == NULL) {
+               return ENOENT;
+       }    
+
+       result = vnode_getwithref(imgsrc_rootvnode);
+       if (result != 0) {
+               return result;
+       }
+       
+       devvp = vnode_mount(imgsrc_rootvnode)->mnt_devvp;
+       result = vnode_getwithref(devvp);
+       if (result != 0) {
+               goto out;
+       }
+
+       result = sysctl_io_number(req, vnode_specrdev(devvp), sizeof(dev_t), NULL, NULL);
+
+       vnode_put(devvp);
+out:
+       vnode_put(imgsrc_rootvnode);
+       return result;
+}
+
+SYSCTL_PROC(_kern, OID_AUTO, imgsrcdev,
+               CTLTYPE_INT | CTLFLAG_RD,
+               0, 0, sysctl_imgsrcdev, "I", ""); 
+#endif /* CONFIG_IMGSRC_ACCESS */
+
+static int
+sysctl_usrstack
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       return sysctl_io_number(req, (int)req->p->user_stack, sizeof(int), NULL, NULL);
+}
+
+SYSCTL_PROC(_kern, KERN_USRSTACK32, usrstack,
+               CTLTYPE_INT | CTLFLAG_RD,
+               0, 0, sysctl_usrstack, "I", "");
+
+static int
+sysctl_usrstack64
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       return sysctl_io_number(req, req->p->user_stack, sizeof(req->p->user_stack), NULL, NULL);
+}
+
+SYSCTL_PROC(_kern, KERN_USRSTACK64, usrstack64,
+               CTLTYPE_QUAD | CTLFLAG_RD,
+               0, 0, sysctl_usrstack64, "Q", "");
+
+SYSCTL_STRING(_kern, KERN_COREFILE, corefile, 
+               CTLFLAG_RW | CTLFLAG_KERN, 
+               corefilename, sizeof(corefilename), "");
+
+static int
+sysctl_coredump
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+#ifdef SECURE_KERNEL
+       return (ENOTSUP);
+#endif
+       int new_value, changed;
+       int error = sysctl_io_number(req, do_coredump, sizeof(int), &new_value, &changed);
+       if (changed) {
+               if ((new_value == 0) || (new_value == 1))
+                       do_coredump = new_value;
+               else
+                       error = EINVAL;
+       }
+       return(error);
+}
+
+SYSCTL_PROC(_kern, KERN_COREDUMP, coredump,
+               CTLTYPE_INT | CTLFLAG_RW,
+               0, 0, sysctl_coredump, "I", "");
+
+static int
+sysctl_suid_coredump
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+#ifdef SECURE_KERNEL
+       return (ENOTSUP);
+#endif
+       int new_value, changed;
+       int error = sysctl_io_number(req, sugid_coredump, sizeof(int), &new_value, &changed);
+       if (changed) {
+               if ((new_value == 0) || (new_value == 1))
+                       sugid_coredump = new_value;
+               else
                        error = EINVAL;
        }
-       return( error );
+       return(error);
+}
+
+SYSCTL_PROC(_kern, KERN_SUGID_COREDUMP, sugid_coredump,
+               CTLTYPE_INT | CTLFLAG_RW,
+               0, 0, sysctl_suid_coredump, "I", "");
+
+static int
+sysctl_delayterm
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       struct proc *p = req->p;
+       int new_value, changed;
+       int error = sysctl_io_number(req, (req->p->p_lflag & P_LDELAYTERM)? 1: 0, sizeof(int), &new_value, &changed);
+       if (changed) {
+               proc_lock(p);
+               if (new_value)
+                       req->p->p_lflag |=  P_LDELAYTERM;
+               else
+                       req->p->p_lflag &=  ~P_LDELAYTERM;
+               proc_unlock(p);
+       }
+       return(error);
+}
+
+SYSCTL_PROC(_kern, KERN_PROCDELAYTERM, delayterm,
+               CTLTYPE_INT | CTLFLAG_RW,
+               0, 0, sysctl_delayterm, "I", "");
+
+
+static int
+sysctl_rage_vnode
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       struct proc *p = req->p;
+        struct  uthread *ut;
+       int new_value, old_value, changed;
+       int error;
+
+       ut = get_bsdthread_info(current_thread());
+
+       if (ut->uu_flag & UT_RAGE_VNODES)
+               old_value = KERN_RAGE_THREAD;
+       else if (p->p_lflag & P_LRAGE_VNODES)
+               old_value = KERN_RAGE_PROC;
+       else
+               old_value = 0;
+
+       error = sysctl_io_number(req, old_value, sizeof(int), &new_value, &changed);
+
+       if (error == 0) {
+               switch (new_value) {
+               case KERN_RAGE_PROC:
+                       proc_lock(p);
+                       p->p_lflag |= P_LRAGE_VNODES;
+                       proc_unlock(p);
+                       break;
+               case KERN_UNRAGE_PROC:
+                       proc_lock(p);
+                       p->p_lflag &= ~P_LRAGE_VNODES;
+                       proc_unlock(p);
+                       break;
+
+               case KERN_RAGE_THREAD:
+                       ut->uu_flag |= UT_RAGE_VNODES;
+                       break;
+               case KERN_UNRAGE_THREAD:
+                       ut = get_bsdthread_info(current_thread());
+                       ut->uu_flag &= ~UT_RAGE_VNODES;
+                       break;
+               }
+       }
+       return(error);
+}
+
+SYSCTL_PROC(_kern, KERN_RAGEVNODE, rage_vnode,
+               CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY,
+               0, 0, sysctl_rage_vnode, "I", "");
+
+
+static int
+sysctl_kern_check_openevt
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       struct proc *p = req->p;
+       int new_value, old_value, changed;
+       int error;
+
+       if (p->p_flag & P_CHECKOPENEVT) {
+               old_value = KERN_OPENEVT_PROC;
+       } else {
+               old_value = 0;
+       }
+
+       error = sysctl_io_number(req, old_value, sizeof(int), &new_value, &changed);
+
+       if (error == 0) {
+               switch (new_value) {
+               case KERN_OPENEVT_PROC:
+                       OSBitOrAtomic(P_CHECKOPENEVT, &p->p_flag);
+                       break;
+
+               case KERN_UNOPENEVT_PROC:
+                       OSBitAndAtomic(~((uint32_t)P_CHECKOPENEVT), &p->p_flag);
+                       break;
+
+               default:
+                       error = EINVAL;
+               }
+       }
+       return(error);
+}
+
+SYSCTL_PROC(_kern, KERN_CHECKOPENEVT, check_openevt, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY,
+            0, 0, sysctl_kern_check_openevt, "I", "set the per-process check-open-evt flag");
+
+
+
+static int
+sysctl_nx
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+#ifdef SECURE_KERNEL
+       return ENOTSUP;
+#endif
+       int new_value, changed;
+       int error;
+
+       error = sysctl_io_number(req, nx_enabled, sizeof(nx_enabled), &new_value, &changed);
+       if (error)
+               return error;
+
+       if (changed) {
+#if defined(__i386__) || defined(__x86_64__)
+               /*
+                * Only allow setting if NX is supported on the chip
+                */
+               if (!(cpuid_extfeatures() & CPUID_EXTFEATURE_XD))
+                       return ENOTSUP;
+#endif
+               nx_enabled = new_value;
+       }
+       return(error);
+}
+
+
+
+SYSCTL_PROC(_kern, KERN_NX_PROTECTION, nx, 
+               CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_KERN, 
+               0, 0, sysctl_nx, "I", "");
+
+static int
+sysctl_loadavg
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+               if (proc_is64bit(req->p)) {
+                       struct user64_loadavg loadinfo64;
+                       fill_loadavg64(&averunnable, &loadinfo64);
+                       return sysctl_io_opaque(req, &loadinfo64, sizeof(loadinfo64), NULL);
+               } else {
+                       struct user32_loadavg loadinfo32;
+                       fill_loadavg32(&averunnable, &loadinfo32);
+                       return sysctl_io_opaque(req, &loadinfo32, sizeof(loadinfo32), NULL);
+               }
+}
+
+SYSCTL_PROC(_vm, VM_LOADAVG, loadavg,
+               CTLTYPE_STRUCT | CTLFLAG_RD,
+               0, 0, sysctl_loadavg, "S,loadavg", "");
+
+static int
+sysctl_swapusage
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+               int                     error;
+               uint64_t                swap_total;
+               uint64_t                swap_avail;
+               vm_size_t               swap_pagesize;
+               boolean_t               swap_encrypted;
+               struct xsw_usage        xsu;
+
+               error = macx_swapinfo(&swap_total,
+                                     &swap_avail,
+                                     &swap_pagesize,
+                                     &swap_encrypted);
+               if (error)
+                       return error;
+
+               xsu.xsu_total = swap_total;
+               xsu.xsu_avail = swap_avail;
+               xsu.xsu_used = swap_total - swap_avail;
+               xsu.xsu_pagesize = swap_pagesize;
+               xsu.xsu_encrypted = swap_encrypted;
+               return sysctl_io_opaque(req, &xsu, sizeof(xsu), NULL);
+}
+
+
+
+SYSCTL_PROC(_vm, VM_SWAPUSAGE, swapusage,
+               CTLTYPE_STRUCT | CTLFLAG_RD,
+               0, 0, sysctl_swapusage, "S,xsw_usage", "");
+
+
+/* this kernel does NOT implement shared_region_make_private_np() */
+SYSCTL_INT(_kern, KERN_SHREG_PRIVATIZABLE, shreg_private, 
+               CTLFLAG_RD, 
+               (int *)NULL, 0, "");
+
+#if defined(__i386__) || defined(__x86_64__)
+static int
+sysctl_sysctl_exec_affinity(__unused struct sysctl_oid *oidp,
+                          __unused void *arg1, __unused int arg2,
+                          struct sysctl_req *req)
+{
+       proc_t cur_proc = req->p;
+       int error;
        
-} /* sysctl_maxproc */
+       if (req->oldptr != USER_ADDR_NULL) {
+               cpu_type_t oldcputype = (cur_proc->p_flag & P_AFFINITY) ? CPU_TYPE_POWERPC : CPU_TYPE_I386;
+               if ((error = SYSCTL_OUT(req, &oldcputype, sizeof(oldcputype))))
+                       return error;
+       }
+
+       if (req->newptr != USER_ADDR_NULL) {
+               cpu_type_t newcputype;
+               if ((error = SYSCTL_IN(req, &newcputype, sizeof(newcputype))))
+                       return error;
+               if (newcputype == CPU_TYPE_I386)
+                       OSBitAndAtomic(~((uint32_t)P_AFFINITY), &cur_proc->p_flag);
+               else if (newcputype == CPU_TYPE_POWERPC)
+                       OSBitOrAtomic(P_AFFINITY, &cur_proc->p_flag);
+               else
+                       return (EINVAL);
+       }
+       
+       return 0;
+}
+SYSCTL_PROC(_sysctl, OID_AUTO, proc_exec_affinity, CTLTYPE_INT|CTLFLAG_RW|CTLFLAG_ANYBODY, 0, 0, sysctl_sysctl_exec_affinity ,"I","proc_exec_affinity");
+#endif
+
+static int
+fetch_process_cputype(
+       proc_t cur_proc,
+       int *name,
+       u_int namelen,
+       cpu_type_t *cputype)
+{
+       proc_t p = PROC_NULL;
+       int refheld = 0;
+       cpu_type_t ret = 0;
+       int error = 0;
+       
+       if (namelen == 0)
+               p = cur_proc;
+       else if (namelen == 1) {
+               p = proc_find(name[0]);
+               if (p == NULL)
+                       return (EINVAL);
+               refheld = 1;
+       } else {
+               error = EINVAL;
+               goto out;
+       }
+
+#if defined(__i386__) || defined(__x86_64__)
+       if (p->p_flag & P_TRANSLATED) {
+               ret = CPU_TYPE_POWERPC;
+       }
+       else
+#endif
+       {
+               ret = cpu_type();
+               if (IS_64BIT_PROCESS(p))
+                       ret |= CPU_ARCH_ABI64;
+       }
+       *cputype = ret;
+       
+       if (refheld != 0)
+               proc_rele(p);
+out:
+       return (error);
+}
+
+static int
+sysctl_sysctl_native(__unused struct sysctl_oid *oidp, void *arg1, int arg2,
+                   struct sysctl_req *req)
+{
+       int error;
+       cpu_type_t proc_cputype = 0;
+       if ((error = fetch_process_cputype(req->p, (int *)arg1, arg2, &proc_cputype)) != 0)
+               return error;
+       int res = 1;
+       if ((proc_cputype & ~CPU_ARCH_MASK) != (cpu_type() & ~CPU_ARCH_MASK))
+               res = 0;
+       return SYSCTL_OUT(req, &res, sizeof(res));
+}      
+SYSCTL_PROC(_sysctl, OID_AUTO, proc_native, CTLTYPE_NODE|CTLFLAG_RD, 0, 0, sysctl_sysctl_native ,"I","proc_native");
+
+static int
+sysctl_sysctl_cputype(__unused struct sysctl_oid *oidp, void *arg1, int arg2,
+                    struct sysctl_req *req)
+{
+       int error;
+       cpu_type_t proc_cputype = 0;
+       if ((error = fetch_process_cputype(req->p, (int *)arg1, arg2, &proc_cputype)) != 0)
+               return error;
+       return SYSCTL_OUT(req, &proc_cputype, sizeof(proc_cputype));
+}
+SYSCTL_PROC(_sysctl, OID_AUTO, proc_cputype, CTLTYPE_NODE|CTLFLAG_RD, 0, 0, sysctl_sysctl_cputype ,"I","proc_cputype");
+
+static int
+sysctl_safeboot
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       return sysctl_io_number(req, boothowto & RB_SAFEBOOT ? 1 : 0, sizeof(int), NULL, NULL);
+}
+
+SYSCTL_PROC(_kern, KERN_SAFEBOOT, safeboot,
+               CTLTYPE_INT | CTLFLAG_RD,
+               0, 0, sysctl_safeboot, "I", "");
+
+static int
+sysctl_singleuser
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       return sysctl_io_number(req, boothowto & RB_SINGLE ? 1 : 0, sizeof(int), NULL, NULL);
+}
+
+SYSCTL_PROC(_kern, OID_AUTO, singleuser,
+               CTLTYPE_INT | CTLFLAG_RD,
+               0, 0, sysctl_singleuser, "I", "");
+
+/*
+ * Controls for debugging affinity sets - see osfmk/kern/affinity.c
+ */
+extern boolean_t       affinity_sets_enabled;
+extern int             affinity_sets_mapping;
+
+SYSCTL_INT (_kern, OID_AUTO, affinity_sets_enabled,
+           CTLFLAG_RW, (int *) &affinity_sets_enabled, 0, "hinting enabled");
+SYSCTL_INT (_kern, OID_AUTO, affinity_sets_mapping,
+           CTLFLAG_RW, &affinity_sets_mapping, 0, "mapping policy");
+
+/*
+ * Limit on total memory users can wire.
+ *
+ * vm_global_user_wire_limit - system wide limit on wired memory from all processes combined. 
+ *
+ * vm_user_wire_limit - per address space limit on wired memory.  This puts a cap on the process's rlimit value.
+ *
+ * These values are initialized to reasonable defaults at boot time based on the available physical memory in
+ * kmem_init().
+ *
+ * All values are in bytes.
+ */
+
+vm_map_size_t  vm_global_no_user_wire_amount;
+vm_map_size_t  vm_global_user_wire_limit;
+vm_map_size_t  vm_user_wire_limit;
+
+/*
+ * There needs to be a more automatic/elegant way to do this
+ */
+
+SYSCTL_QUAD(_vm, OID_AUTO, global_no_user_wire_amount, CTLFLAG_RW, &vm_global_no_user_wire_amount, "");
+SYSCTL_QUAD(_vm, OID_AUTO, global_user_wire_limit, CTLFLAG_RW, &vm_global_user_wire_limit, "");
+SYSCTL_QUAD(_vm, OID_AUTO, user_wire_limit, CTLFLAG_RW, &vm_user_wire_limit, "");
+
+
+
+/*
+ * enable back trace events for thread blocks
+ */
+
+extern uint32_t        kdebug_thread_block;
+
+SYSCTL_INT (_kern, OID_AUTO, kdebug_thread_block,
+           CTLFLAG_RW, &kdebug_thread_block, 0, "kdebug thread_block");
+
+/*
+ * Kernel stack size and depth
+ */
+SYSCTL_INT (_kern, OID_AUTO, stack_size,
+           CTLFLAG_RD, (int *) &kernel_stack_size, 0, "Kernel stack size");
+SYSCTL_INT (_kern, OID_AUTO, stack_depth_max,
+           CTLFLAG_RD, (int *) &kernel_stack_depth_max, 0, "Max kernel stack depth at interrupt or context switch");
+
+/*
+ * enable back trace for port allocations
+ */
+extern int ipc_portbt;
+
+SYSCTL_INT(_kern, OID_AUTO, ipc_portbt, 
+               CTLFLAG_RW | CTLFLAG_KERN, 
+               &ipc_portbt, 0, "");
+