xnu-792.6.76.tar.gz

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

diff --git a/bsd/kern/kern_newsysctl.c b/bsd/kern/kern_newsysctl.c
index 0646783116baa0af323d8b29a51b3c1a9600f97e..63524f2c4d8e22152428e8502f1e17a1c0afcfc1 100644 (file)
--- a/bsd/kern/kern_newsysctl.c
+++ b/bsd/kern/kern_newsysctl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -66,7 +66,7 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
-#include <sys/proc.h>
+#include <sys/proc_internal.h>
 #include <sys/systm.h>
 
 #include <bsm/audit_kernel.h>
@@ -307,15 +307,15 @@ sysctl_sysctl_name SYSCTL_HANDLER_ARGS
        int error = 0;
        struct sysctl_oid *oid;
        struct sysctl_oid_list *lsp = &sysctl__children, *lsp2;
-       char buf[10];
+       char tempbuf[10];
 
        while (namelen) {
                if (!lsp) {
-                       snprintf(buf,sizeof(buf),"%d",*name);
+                       snprintf(tempbuf,sizeof(tempbuf),"%d",*name);
                        if (req->oldidx)
                                error = SYSCTL_OUT(req, ".", 1);
                        if (!error)
-                               error = SYSCTL_OUT(req, buf, strlen(buf));
+                               error = SYSCTL_OUT(req, tempbuf, strlen(tempbuf));
                        if (error)
                                return (error);
                        namelen--;
@@ -497,8 +497,7 @@ sysctl_sysctl_name2oid SYSCTL_HANDLER_ARGS
        if (req->newlen >= MAXPATHLEN)  /* XXX arbitrary, undocumented */
                return (ENAMETOOLONG);
 
-       p = _MALLOC(req->newlen+1, M_TEMP, M_WAITOK);
-
+       MALLOC(p, char *,req->newlen+1, M_TEMP, M_WAITOK);
        if (!p)
            return ENOMEM;
 
@@ -737,14 +736,13 @@ static int
 sysctl_old_kernel(struct sysctl_req *req, const void *p, size_t l)
 {
        size_t i = 0;
-       int error = 0;
 
        if (req->oldptr) {
                i = l;
                if (i > req->oldlen - req->oldidx)
                        i = req->oldlen - req->oldidx;
                if (i > 0)
-                       bcopy((void*)p, (char *)req->oldptr + req->oldidx, i);
+                       bcopy((void*)p, CAST_DOWN(char *, (req->oldptr + req->oldidx)), i);
        }
        req->oldidx += l;
        if (req->oldptr && i != l)
@@ -759,7 +757,7 @@ sysctl_new_kernel(struct sysctl_req *req, void *p, size_t l)
                return 0;
        if (req->newlen - req->newidx < l)
                return (EINVAL);
-       bcopy((char *)req->newptr + req->newidx, p, l);
+       bcopy(CAST_DOWN(char *, (req->newptr + req->newidx)), p, l);
        req->newidx += l;
        return (0);
 }
@@ -779,10 +777,10 @@ kernel_sysctl(struct proc *p, int *name, u_int namelen, void *old, size_t *oldle
        if (oldlenp)
                req.oldlen = *oldlenp;
        if (old)
-               req.oldptr= old;
+               req.oldptr = CAST_USER_ADDR_T(old);
        if (newlen) {
                req.newlen = newlen;
-               req.newptr = new;
+               req.newptr = CAST_USER_ADDR_T(new);
        }
        req.oldfunc = sysctl_old_kernel;
        req.newfunc = sysctl_new_kernel;
@@ -806,7 +804,7 @@ kernel_sysctl(struct proc *p, int *name, u_int namelen, void *old, size_t *oldle
 
        /* unlock memory if required */
        if (req.lock == 2)
-               vsunlock(req.oldptr, req.oldlen, B_WRITE);
+               vsunlock(req.oldptr, (user_size_t)req.oldlen, B_WRITE);
 
        memlock.sl_lock = 0;
 
@@ -845,8 +843,7 @@ sysctl_old_user(struct sysctl_req *req, const void *p, size_t l)
                if (i > req->oldlen - req->oldidx)
                        i = req->oldlen - req->oldidx;
                if (i > 0)
-                       error = copyout((void*)p, (char *)req->oldptr + req->oldidx,
-                                       i);
+                       error = copyout((void*)p, (req->oldptr + req->oldidx), i);
        }
        req->oldidx += l;
        if (error)
@@ -865,7 +862,7 @@ sysctl_new_user(struct sysctl_req *req, void *p, size_t l)
                return 0;
        if (req->newlen - req->newidx < l)
                return (EINVAL);
-       error = copyin((char *)req->newptr + req->newidx, p, l);
+       error = copyin((req->newptr + req->newidx), p, l);
        req->newidx += l;
        return (error);
 }
@@ -934,13 +931,6 @@ found:
            return EINVAL;
        }
 
-       /*
-        * Switch to the NETWORK funnel for CTL_NET and KERN_IPC sysctls
-        */
-
-       if (((name[0] == CTL_NET) || ((name[0] == CTL_KERN) &&
-                                                      (name[1] == KERN_IPC))))
-            thread_funnel_switch(KERNEL_FUNNEL, NETWORK_FUNNEL);
 
        if ((oid->oid_kind & CTLTYPE) == CTLTYPE_NODE) {
                i = (oid->oid_handler) (oid,
@@ -952,14 +942,6 @@ found:
                                        req);
        }
 
-       /*
-        * Switch back to the KERNEL funnel, if necessary
-        */
-
-       if (((name[0] == CTL_NET) || ((name[0] == CTL_KERN) &&
-                                                      (name[1] == KERN_IPC))))
-            thread_funnel_switch(NETWORK_FUNNEL, KERNEL_FUNNEL);
-
        return (i);
 }
 
@@ -984,17 +966,17 @@ new_sysctl(struct proc *p, struct sysctl_args *uap)
        if (uap->namelen > CTL_MAXNAME || uap->namelen < 2)
                return (EINVAL);
 
-       error = copyin(uap->name, &name, uap->namelen * sizeof(int));
+       error = copyin(CAST_USER_ADDR_T(uap->name), &name, uap->namelen * sizeof(int));
        if (error)
                return (error);
 
        error = userland_sysctl(p, name, uap->namelen,
-               uap->old, uap->oldlenp, 0,
-               uap->new, uap->newlen, &j);
+                                   CAST_USER_ADDR_T(uap->old), uap->oldlenp, 0,
+                                   CAST_USER_ADDR_T(uap->new), uap->newlen, &j);
        if (error && error != ENOMEM)
                return (error);
        if (uap->oldlenp) {
-               i = copyout(&j, uap->oldlenp, sizeof(j));
+               i = copyout(&j, CAST_USER_ADDR_T(uap->oldlenp), sizeof(j));
                if (i)
                        return (i);
        }
@@ -1006,7 +988,9 @@ new_sysctl(struct proc *p, struct sysctl_args *uap)
  * must be in kernel space.
  */
 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)
+userland_sysctl(struct proc *p, int *name, u_int namelen, user_addr_t oldp, 
+                size_t *oldlenp, int inkernel, user_addr_t newp, size_t newlen, 
+                size_t *retval)
 {
        int error = 0;
        struct sysctl_req req, req2;
@@ -1019,19 +1003,19 @@ userland_sysctl(struct proc *p, int *name, u_int namelen, void *old, size_t *old
                if (inkernel) {
                        req.oldlen = *oldlenp;
                } else {
-                       error = copyin(oldlenp, &req.oldlen, sizeof(*oldlenp));
+                       error = copyin(CAST_USER_ADDR_T(oldlenp), &req.oldlen, sizeof(*oldlenp));
                        if (error)
                                return (error);
                }
        }
 
-       if (old) {
-               req.oldptr= old;
+       if (oldp) {
+               req.oldptr = oldp;
        }
 
        if (newlen) {
                req.newlen = newlen;
-               req.newptr = new;
+               req.newptr = newp;
        }
 
        req.oldfunc = sysctl_old_user;