xnu-792.10.96.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 5a15de0ea898594f32581f2ff15328e4d6b06f78..d98a823d620d99c77af012ace3948e00bc0b6fc6 100644 (file)
--- a/bsd/dev/i386/stubs.c
+++ b/bsd/dev/i386/stubs.c
@@ -37,12 +37,13 @@
 #include <kern/task.h>
 #include <kern/thread.h>
 #include <vm/vm_map.h>
+#include <machine/machine_routines.h>
 
 /* XXX should be elsewhere (cpeak) */
-extern int     set_bsduthreadargs(thread_t, void *, void *);
+extern struct proc *i386_current_proc(void);
 extern void    *get_bsduthreadarg(thread_t);
 extern int     *get_bsduthreadrval(thread_t);
-extern int     *get_bsduthreadlowpridelay(thread_t);
+extern void    *find_user_regs(thread_t);
 
 /* 
  * copy a null terminated string from the kernel address space into
@@ -111,56 +112,62 @@ copywithin(void *src, void *dst, size_t count)
        return 0;
 }
 
-int
-set_bsduthreadargs(thread_t th, void * pcb, __unused void *ignored_arg)
-{
+/*
+ * This is just current_proc() from bsd/kern/bsd_stubs.c, but instead of
+ * returning kernproc in the non-vfork() case, it can return NULL.  This is
+ * needed because the system call entry point is in osfmk/i386/bsd_i386.c
+ * instead of bsd/dev/i386, and therefore cannot see some BSD thread
+ * internals.  We need to distinguish kernproc defaulting in the vfork and
+ * non-vfork cases vs. actually being the real process context.
+ */     
+struct proc *
+i386_current_proc(void)
+{       
        struct uthread * ut;
-       struct proc *p = current_proc();
-
-       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);
+       struct proc *p; 
+       thread_t thr_act = current_thread();
+
+       ut = (struct uthread *)get_bsdthread_info(thr_act);
+       if (ut &&  (ut->uu_flag & UT_VFORK)) { 
+               if (ut->uu_proc) {
+                       p = ut->uu_proc; 
+                       if ((p->p_flag & P_INVFORK) == 0)
+                               panic("returning child proc not under vfork");
+                       if (p->p_vforkact != (void *)thr_act)
+                               panic("returning child proc which is not cur_act");
+                       return(p);
+               } else {
+                       return (kernproc);
+               }
        }
 
-       return(1);
+       /* Not in vfork - may return NULL */
+       p = (struct proc *)get_bsdtask_info(current_task());
+
+       return (p);
 }
 
 void *
 get_bsduthreadarg(thread_t th)
 {
-struct uthread *ut;
+        void   *arg_ptr;
+       struct uthread *ut;
+  
        ut = get_bsdthread_info(th);
-       return((void *)(ut->uu_arg));
+
+       if (ml_thread_is64bit(th) == TRUE)
+               arg_ptr = (void *)saved_state64(find_user_regs(th));
+       else
+               arg_ptr = (void *)(ut->uu_arg);
+
+       return(arg_ptr);
 }
 
 int *
 get_bsduthreadrval(thread_t th)
 {
-struct uthread *ut;
-       ut = get_bsdthread_info(th);
-       return(&ut->uu_rval[0]);
-}
+        struct uthread *ut;
 
-int *
-get_bsduthreadlowpridelay(thread_t th)
-{
-struct uthread *ut;
        ut = get_bsdthread_info(th);
-       return(&ut->uu_lowpri_delay);
+       return(&ut->uu_rval[0]);
 }