xnu-792.6.61.tar.gz

[apple/xnu.git] / bsd / dev / i386 / stubs.c

diff --git a/bsd/dev/i386/stubs.c b/bsd/dev/i386/stubs.c
index 491a189e9f4f7b4b3d47b63f854668e82095a263..5a15de0ea898594f32581f2ff15328e4d6b06f78 100644 (file)
--- a/bsd/dev/i386/stubs.c
+++ b/bsd/dev/i386/stubs.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.

  * 
  * 

- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. 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
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER

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

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

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -30,17 +27,22 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
 #include <sys/param.h>
 #include <sys/systm.h>

-#include <sys/buf.h>

 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/conf.h>

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

 #include <sys/user.h>
 #include <kern/task.h>
 #include <kern/thread.h>
 #include <sys/user.h>
 #include <kern/task.h>
 #include <kern/thread.h>

-#include <kern/thread_act.h>

 #include <vm/vm_map.h>
 
 #include <vm/vm_map.h>
 

+/* XXX should be elsewhere (cpeak) */
+extern int     set_bsduthreadargs(thread_t, void *, void *);
+extern void    *get_bsduthreadarg(thread_t);
+extern int     *get_bsduthreadrval(thread_t);
+extern int     *get_bsduthreadlowpridelay(thread_t);

 
 /* 
  * copy a null terminated string from the kernel address space into
 
 /* 
  * copy a null terminated string from the kernel address space into


@@ -53,11 +55,11 @@
  * the number of bytes copied is always returned in lencopied.
  */
 int
  * the number of bytes copied is always returned in lencopied.
  */
 int

-copyoutstr(from, to, maxlen, lencopied)
-    void * from, * to;
-    size_t maxlen, *lencopied;
+copyoutstr(const void *from, user_addr_t to, size_t maxlen, size_t *lencopied)

 {
 {

-       int slen,len,error=0;
+       size_t  slen;
+       size_t  len;
+       int     error = 0;

 
        slen = strlen(from) + 1;
        if (slen > maxlen)
 
        slen = strlen(from) + 1;
        if (slen > maxlen)


@@ -84,42 +86,58 @@ copyoutstr(from, to, maxlen, lencopied)
  */
 /* from ppc/fault_copy.c -Titan1T4 VERSION  */
 int
  */
 /* from ppc/fault_copy.c -Titan1T4 VERSION  */
 int

-copystr(vfrom, vto, maxlen, lencopied)
-    register void * vfrom, *vto;
-    size_t maxlen, *lencopied;
+copystr(const void *vfrom, void *vto, size_t maxlen, size_t *lencopied)

 {
 {

-    register unsigned l;
-    int error;
-caddr_t from, to;
-
-       from = vfrom;
-       to = vto;
-    for (l = 0; l < maxlen; l++)
-        if ((*to++ = *from++) == '\0') {
-            if (lencopied)
-                *lencopied = l + 1;
-            return 0;
-        }
-    if (lencopied)
-       *lencopied = maxlen;
-    return ENAMETOOLONG;
+       size_t          l;
+       char const      *from = (char const *) vfrom;
+       char            *to = (char *) vto;
+
+       for (l = 0; l < maxlen; l++) {
+               if ((*to++ = *from++) == '\0') {
+                       if (lencopied)
+                               *lencopied = l + 1;
+                       return 0;
+               }
+       }
+       if (lencopied)
+               *lencopied = maxlen;
+       return ENAMETOOLONG;

 }
 
 }
 

-int copywithin(src, dst, count)
-void  * src, *dst;
-size_t count;
+int
+copywithin(void *src, void *dst, size_t count)

 {
        bcopy(src,dst,count);
        return 0;
 }
 
 {
        bcopy(src,dst,count);
        return 0;
 }
 

-set_bsduthreadargs(thread_t th, void * pcb, void *ignored_arg)
+int
+set_bsduthreadargs(thread_t th, void * pcb, __unused void *ignored_arg)

 {
 {

-struct uthread * ut;
+       struct uthread * ut;
+       struct proc *p = current_proc();

 
        ut = get_bsdthread_info(th);
        ut->uu_ar0 = (int *)pcb;
 
 
        ut = get_bsdthread_info(th);
        ut->uu_ar0 = (int *)pcb;
 

+       /*
+        * Delayed binding of thread credential to process credential.
+        *
+        * XXX This doesn't really belong here, but the i386 code has a
+        * XXX number of seemingly gratuitous structural differences that
+        * XXX make this the most appropriate place to do the work.
+        */
+       if (ut->uu_ucred != p->p_ucred &&
+           (ut->uu_flag & UT_SETUID) == 0) {
+               kauth_cred_t old = ut->uu_ucred;
+               proc_lock(p);
+               ut->uu_ucred = p->p_ucred;
+               kauth_cred_ref(ut->uu_ucred);
+               proc_unlock(p);
+               if (old != NOCRED)
+                       kauth_cred_rele(old);
+       }
+

        return(1);
 }
 
        return(1);
 }
 


@@ -132,9 +150,17 @@ struct uthread *ut;
 }
 
 int *
 }
 
 int *

-get_bsduthreadrval(thread_act_t th)
+get_bsduthreadrval(thread_t th)

 {
 struct uthread *ut;
        ut = get_bsdthread_info(th);
        return(&ut->uu_rval[0]);
 }
 {
 struct uthread *ut;
        ut = get_bsdthread_info(th);
        return(&ut->uu_rval[0]);
 }

+
+int *
+get_bsduthreadlowpridelay(thread_t th)
+{
+struct uthread *ut;
+       ut = get_bsdthread_info(th);
+       return(&ut->uu_lowpri_delay);
+}