#include <sys/mount.h>
#include <sys/sysproto.h>
-#include <bsm/audit_kernel.h>
+#include <security/audit/audit.h>
#include <machine/spl.h>
#include <sys/vm.h>
#include <sys/user.h> /* for coredump */
#include <kern/ast.h> /* for APC support */
-#include <kern/lock.h>
#include <kern/task.h> /* extern void *get_bsdtask_info(task_t); */
#include <kern/thread.h>
#include <kern/sched_prim.h>
extern int thread_enable_fpe(thread_t act, int onoff);
extern thread_t port_name_to_thread(mach_port_name_t port_name);
extern kern_return_t get_signalact(task_t , thread_t *, int);
-extern boolean_t thread_should_abort(thread_t);
extern unsigned int get_useraddr(void);
+extern kern_return_t task_suspend_internal(task_t);
+extern kern_return_t task_resume_internal(task_t);
/*
* ---
static void stop(proc_t, proc_t);
int cansignal(proc_t, kauth_cred_t, proc_t, int, int);
int killpg1(proc_t, int, int, int, int);
-int setsigvec(proc_t, int, struct __user_sigaction *);
+int setsigvec(proc_t, thread_t, int, struct __kern_sigaction *, boolean_t in_sigstart);
static void psignal_uthread(thread_t, int);
kern_return_t do_bsdexception(int, int, int);
void __posix_sem_syscall_return(kern_return_t);
static int filt_sigattach(struct knote *kn);
static void filt_sigdetach(struct knote *kn);
static int filt_signal(struct knote *kn, long hint);
-
-struct filterops sig_filtops =
- { 0, filt_sigattach, filt_sigdetach, filt_signal };
+static void filt_signaltouch(struct knote *kn, struct kevent64_s *kev,
+ long type);
+
+struct filterops sig_filtops = {
+ .f_attach = filt_sigattach,
+ .f_detach = filt_sigdetach,
+ .f_event = filt_signal,
+ .f_touch = filt_signaltouch,
+};
/* structures and fns for killpg1 iterartion callback and filters */
struct killpg1_filtargs {
kauth_cred_t uc;
int signum;
int * nfoundp;
+ int zombie;
};
static int killpg1_filt(proc_t p, void * arg);
* NOTE: Source and target may *NOT* overlap! (target is smaller)
*/
static void
-sigaltstack_64to32(struct user_sigaltstack *in, struct sigaltstack *out)
+sigaltstack_kern_to_user32(struct kern_sigaltstack *in, struct user32_sigaltstack *out)
+{
+ out->ss_sp = CAST_DOWN_EXPLICIT(user32_addr_t, in->ss_sp);
+ out->ss_size = CAST_DOWN_EXPLICIT(user32_size_t, in->ss_size);
+ out->ss_flags = in->ss_flags;
+}
+
+static void
+sigaltstack_kern_to_user64(struct kern_sigaltstack *in, struct user64_sigaltstack *out)
{
- out->ss_sp = CAST_DOWN(void *,in->ss_sp);
+ out->ss_sp = in->ss_sp;
out->ss_size = in->ss_size;
out->ss_flags = in->ss_flags;
}
* the beginning.
*/
static void
-sigaltstack_32to64(struct sigaltstack *in, struct user_sigaltstack *out)
+sigaltstack_user32_to_kern(struct user32_sigaltstack *in, struct kern_sigaltstack *out)
+{
+ out->ss_flags = in->ss_flags;
+ out->ss_size = in->ss_size;
+ out->ss_sp = CAST_USER_ADDR_T(in->ss_sp);
+}
+static void
+sigaltstack_user64_to_kern(struct user64_sigaltstack *in, struct kern_sigaltstack *out)
{
out->ss_flags = in->ss_flags;
out->ss_size = in->ss_size;
- out->ss_sp = CAST_USER_ADDR_T(in->ss_sp);
+ out->ss_sp = in->ss_sp;
}
static void
-sigaction_64to32(struct user_sigaction *in, struct sigaction *out)
+sigaction_kern_to_user32(struct kern_sigaction *in, struct user32_sigaction *out)
{
/* This assumes 32 bit __sa_handler is of type sig_t */
- out->__sigaction_u.__sa_handler = CAST_DOWN(sig_t,in->__sigaction_u.__sa_handler);
+ out->__sigaction_u.__sa_handler = CAST_DOWN_EXPLICIT(user32_addr_t,in->__sigaction_u.__sa_handler);
+ out->sa_mask = in->sa_mask;
+ out->sa_flags = in->sa_flags;
+}
+static void
+sigaction_kern_to_user64(struct kern_sigaction *in, struct user64_sigaction *out)
+{
+ /* This assumes 32 bit __sa_handler is of type sig_t */
+ out->__sigaction_u.__sa_handler = in->__sigaction_u.__sa_handler;
out->sa_mask = in->sa_mask;
out->sa_flags = in->sa_flags;
}
static void
-__sigaction_32to64(struct __sigaction *in, struct __user_sigaction *out)
+__sigaction_user32_to_kern(struct __user32_sigaction *in, struct __kern_sigaction *out)
{
out->__sigaction_u.__sa_handler = CAST_USER_ADDR_T(in->__sigaction_u.__sa_handler);
out->sa_tramp = CAST_USER_ADDR_T(in->sa_tramp);
out->sa_flags = in->sa_flags;
}
+static void
+__sigaction_user64_to_kern(struct __user64_sigaction *in, struct __kern_sigaction *out)
+{
+ out->__sigaction_u.__sa_handler = in->__sigaction_u.__sa_handler;
+ out->sa_tramp = in->sa_tramp;
+ out->sa_mask = in->sa_mask;
+ out->sa_flags = in->sa_flags;
+}
#if SIGNAL_DEBUG
void ram_printf(int);
proc_list_unlock();
/*
- * If the real or effective UID of the sender matches the real,
- * effective, or ssaved UID of the target, permit the signal to
+ * If the real or effective UID of the sender matches the real
+ * or saved UID of the target, permit the signal to
* be sent.
*/
if (zombie == 0)
else
my_cred = proc_ucred(q);
- if (uc->cr_ruid == my_cred->cr_ruid ||
- uc->cr_ruid == my_cred->cr_svuid ||
- kauth_cred_getuid(uc) == my_cred->cr_ruid ||
- kauth_cred_getuid(uc) == my_cred->cr_svuid ||
- uc->cr_ruid == kauth_cred_getuid(my_cred) ||
- kauth_cred_getuid(uc) == kauth_cred_getuid(my_cred)) {
+ if (kauth_cred_getruid(uc) == kauth_cred_getruid(my_cred) ||
+ kauth_cred_getruid(uc) == kauth_cred_getsvuid(my_cred) ||
+ kauth_cred_getuid(uc) == kauth_cred_getruid(my_cred) ||
+ kauth_cred_getuid(uc) == kauth_cred_getsvuid(my_cred)) {
if (zombie == 0)
kauth_cred_unref(&my_cred);
return (1);
* EINVAL
* copyout:EFAULT
* copyin:EFAULT
+ *
+ * Notes: Uses current thread as a parameter to inform PPC to enable
+ * FPU exceptions via setsigvec(); this operation is not proxy
+ * safe!
*/
/* ARGSUSED */
int
-sigaction(proc_t p, struct sigaction_args *uap, __unused register_t *retval)
+sigaction(proc_t p, struct sigaction_args *uap, __unused int32_t *retval)
{
- struct user_sigaction vec;
- struct __user_sigaction __vec;
+ struct kern_sigaction vec;
+ struct __kern_sigaction __vec;
- struct user_sigaction *sa = &vec;
+ struct kern_sigaction *sa = &vec;
struct sigacts *ps = p->p_sigacts;
int signum;
sa->sa_flags |= SA_NOCLDWAIT;
if (IS_64BIT_PROCESS(p)) {
- error = copyout(sa, uap->osa, sizeof(struct user_sigaction));
+ struct user64_sigaction vec64;
+
+ sigaction_kern_to_user64(sa, &vec64);
+ error = copyout(&vec64, uap->osa, sizeof(vec64));
} else {
- struct sigaction vec32;
- sigaction_64to32(sa, &vec32);
- error = copyout(&vec32, uap->osa, sizeof(struct sigaction));
+ struct user32_sigaction vec32;
+
+ sigaction_kern_to_user32(sa, &vec32);
+ error = copyout(&vec32, uap->osa, sizeof(vec32));
}
if (error)
return (error);
}
if (uap->nsa) {
if (IS_64BIT_PROCESS(p)) {
- error = copyin(uap->nsa, &__vec, sizeof(struct __user_sigaction));
+ struct __user64_sigaction __vec64;
+
+ error = copyin(uap->nsa, &__vec64, sizeof(__vec64));
+ __sigaction_user64_to_kern(&__vec64, &__vec);
} else {
- struct __sigaction __vec32;
- error = copyin(uap->nsa, &__vec32, sizeof(struct __sigaction));
- __sigaction_32to64(&__vec32, &__vec);
+ struct __user32_sigaction __vec32;
+
+ error = copyin(uap->nsa, &__vec32, sizeof(__vec32));
+ __sigaction_user32_to_kern(&__vec32, &__vec);
}
if (error)
return (error);
__vec.sa_flags &= SA_USERSPACE_MASK; /* Only pass on valid sa_flags */
- error = setsigvec(p, signum, &__vec);
+ error = setsigvec(p, current_thread(), signum, &__vec, FALSE);
}
return (error);
}
/* Routines to manipulate bits on all threads */
int
-clear_procsiglist(proc_t p, int bit)
+clear_procsiglist(proc_t p, int bit, boolean_t in_signalstart)
{
struct uthread * uth;
thread_t thact;
proc_lock(p);
- proc_signalstart(p, 1);
+ if (!in_signalstart)
+ proc_signalstart(p, 1);
if ((p->p_lflag & P_LINVFORK) && p->p_vforkact) {
thact = p->p_vforkact;
if (uth) {
uth->uu_siglist &= ~bit;
}
- proc_signalend(p, 1);
+ if (!in_signalstart)
+ proc_signalend(p, 1);
proc_unlock(p);
return(0);
}
TAILQ_FOREACH(uth, &p->p_uthlist, uu_list) {
uth->uu_siglist &= ~bit;
}
-
- proc_signalend(p, 1);
+ p->p_siglist &= ~bit;
+ if (!in_signalstart)
+ proc_signalend(p, 1);
proc_unlock(p);
return(0);
}
/* XXX should be static? */
+/*
+ * Notes: The thread parameter is used in the PPC case to select the
+ * thread on which the floating point exception will be enabled
+ * or disabled. We can't simply take current_thread(), since
+ * this is called from posix_spawn() on the not currently running
+ * process/thread pair.
+ *
+ * We mark thread as unused to alow compilation without warning
+ * on non-PPC platforms.
+ */
int
-setsigvec(proc_t p, int signum, struct __user_sigaction *sa)
+setsigvec(proc_t p, __unused thread_t thread, int signum, struct __kern_sigaction *sa, boolean_t in_sigstart)
{
struct sigacts *ps = p->p_sigacts;
int bit;
ps->ps_signodefer &= ~bit;
if (signum == SIGCHLD) {
if (sa->sa_flags & SA_NOCLDSTOP)
- OSBitOrAtomic(P_NOCLDSTOP, (UInt32 *)&p->p_flag);
+ OSBitOrAtomic(P_NOCLDSTOP, &p->p_flag);
else
- OSBitAndAtomic(~((uint32_t)P_NOCLDSTOP), (UInt32 *)&p->p_flag);
+ OSBitAndAtomic(~((uint32_t)P_NOCLDSTOP), &p->p_flag);
if ((sa->sa_flags & SA_NOCLDWAIT) || (sa->sa_handler == SIG_IGN))
- OSBitOrAtomic(P_NOCLDWAIT, (UInt32 *)&p->p_flag);
+ OSBitOrAtomic(P_NOCLDWAIT, &p->p_flag);
else
- OSBitAndAtomic(~((uint32_t)P_NOCLDWAIT), (UInt32 *)&p->p_flag);
+ OSBitAndAtomic(~((uint32_t)P_NOCLDWAIT), &p->p_flag);
}
-#ifdef __ppc__
- if (signum == SIGFPE) {
- if (sa->sa_handler == SIG_DFL || sa->sa_handler == SIG_IGN)
- thread_enable_fpe(current_thread(), 0);
- else
- thread_enable_fpe(current_thread(), 1);
- }
-#endif /* __ppc__ */
/*
* Set bit in p_sigignore for signals that are set to SIG_IGN,
* and for signals set to SIG_DFL where the default is to ignore.
if (sa->sa_handler == SIG_IGN ||
(sigprop[signum] & SA_IGNORE && sa->sa_handler == SIG_DFL)) {
- clear_procsiglist(p, bit);
+ clear_procsiglist(p, bit, in_sigstart);
if (signum != SIGCONT)
p->p_sigignore |= bit; /* easier in psignal */
p->p_sigcatch &= ~bit;
{
int i;
- for (i = 0; i < NSIG; i++)
+ for (i = 1; i < NSIG; i++)
if (sigprop[i] & SA_IGNORE && i != SIGCONT)
p->p_sigignore |= sigmask(i);
}
struct uthread *ut;
ut = (struct uthread *)get_bsdthread_info(thread);
+
+ /*
+ * transfer saved signal states from the process
+ * back to the current thread.
+ *
+ * NOTE: We do this without the process locked,
+ * because we are guaranteed to be single-threaded
+ * by this point in exec and the p_siglist is
+ * only accessed by threads inside the process.
+ */
+ ut->uu_siglist |= p->p_siglist;
+ p->p_siglist = 0;
+
/*
* Reset caught signals. Held signals remain held
* through p_sigmask (unless they were caught,
if (sigprop[nc] & SA_IGNORE) {
if (nc != SIGCONT)
p->p_sigignore |= mask;
- if (thread){
- ut->uu_siglist &= ~mask;
- } else
- clear_procsiglist(p, mask);
+ ut->uu_siglist &= ~mask;
}
ps->ps_sigact[nc] = SIG_DFL;
}
+
/*
* Reset stack state to the user stack.
* Clear set of signals caught on the signal stack.
* the library stub does the rest.
*/
int
-sigprocmask(proc_t p, struct sigprocmask_args *uap, __unused register_t *retval)
+sigprocmask(proc_t p, struct sigprocmask_args *uap, __unused int32_t *retval)
{
int error = 0;
sigset_t oldmask, nmask;
}
int
-sigpending(__unused proc_t p, struct sigpending_args *uap, __unused register_t *retval)
+sigpending(__unused proc_t p, struct sigpending_args *uap, __unused int32_t *retval)
{
struct uthread *ut;
sigset_t pendlist;
}
int
-sigsuspend(proc_t p, struct sigsuspend_args *uap, register_t *retval)
+sigsuspend(proc_t p, struct sigsuspend_args *uap, int32_t *retval)
{
__pthread_testcancel(1);
return(sigsuspend_nocancel(p, (struct sigsuspend_nocancel_args *)uap, retval));
}
int
-sigsuspend_nocancel(proc_t p, struct sigsuspend_nocancel_args *uap, __unused register_t *retval)
+sigsuspend_nocancel(proc_t p, struct sigsuspend_nocancel_args *uap, __unused int32_t *retval)
{
struct uthread *ut;
int
__disable_threadsignal(__unused proc_t p,
__unused struct __disable_threadsignal_args *uap,
- __unused register_t *retval)
+ __unused int32_t *retval)
{
struct uthread *uth;
int
__pthread_markcancel(__unused proc_t p,
- struct __pthread_markcancel_args *uap, __unused register_t *retval)
+ struct __pthread_markcancel_args *uap, __unused int32_t *retval)
{
thread_act_t target_act;
int error = 0;
*/
int
__pthread_canceled(__unused proc_t p,
- struct __pthread_canceled_args *uap, __unused register_t *retval)
+ struct __pthread_canceled_args *uap, __unused int32_t *retval)
{
thread_act_t thread;
struct uthread *uth;
/* does not return */
}
+#if OLD_SEMWAIT_SIGNAL
/*
* Returns: 0 Success
* EINTR
* ETIMEDOUT
* EINVAL
+ * EFAULT if timespec is NULL
*/
int
-__semwait_signal(__unused proc_t p, struct __semwait_signal_args *uap,
- register_t *retval)
+__old_semwait_signal(proc_t p, struct __old_semwait_signal_args *uap,
+ int32_t *retval)
{
__pthread_testcancel(0);
- return(__semwait_signal_nocancel(p, (struct __semwait_signal_nocancel_args *)uap, retval));
+ return(__old_semwait_signal_nocancel(p, (struct __old_semwait_signal_nocancel_args *)uap, retval));
}
int
-__semwait_signal_nocancel(__unused proc_t p, struct __semwait_signal_nocancel_args *uap,
- __unused register_t *retval)
+__old_semwait_signal_nocancel(proc_t p, struct __old_semwait_signal_nocancel_args *uap,
+ __unused int32_t *retval)
{
-
+
kern_return_t kern_result;
+ int error;
mach_timespec_t then;
struct timespec now;
-
+ struct user_timespec ts;
+ boolean_t truncated_timeout = FALSE;
+
if(uap->timeout) {
-
+
+ if (IS_64BIT_PROCESS(p)) {
+ struct user64_timespec ts64;
+ error = copyin(uap->ts, &ts64, sizeof(ts64));
+ ts.tv_sec = ts64.tv_sec;
+ ts.tv_nsec = ts64.tv_nsec;
+ } else {
+ struct user32_timespec ts32;
+ error = copyin(uap->ts, &ts32, sizeof(ts32));
+ ts.tv_sec = ts32.tv_sec;
+ ts.tv_nsec = ts32.tv_nsec;
+ }
+
+ if (error) {
+ return error;
+ }
+
+ if ((ts.tv_sec & 0xFFFFFFFF00000000ULL) != 0) {
+ ts.tv_sec = 0xFFFFFFFF;
+ ts.tv_nsec = 0;
+ truncated_timeout = TRUE;
+ }
+
if (uap->relative) {
- then.tv_sec = uap->tv_sec;
- then.tv_nsec = uap->tv_nsec;
+ then.tv_sec = ts.tv_sec;
+ then.tv_nsec = ts.tv_nsec;
} else {
nanotime(&now);
- then.tv_sec = uap->tv_sec - now.tv_sec;
- then.tv_nsec = uap->tv_nsec - now.tv_nsec;
- if (then.tv_nsec < 0) {
- then.tv_nsec += NSEC_PER_SEC;
- then.tv_sec--;
- }
+
/* if time has elapsed, set time to null timepsec to bailout rightaway */
- if ((int)then.tv_sec < 0) {
+ if (now.tv_sec == ts.tv_sec ?
+ now.tv_nsec > ts.tv_nsec :
+ now.tv_sec > ts.tv_sec) {
then.tv_sec = 0;
then.tv_nsec = 0;
+ } else {
+ then.tv_sec = ts.tv_sec - now.tv_sec;
+ then.tv_nsec = ts.tv_nsec - now.tv_nsec;
+ if (then.tv_nsec < 0) {
+ then.tv_nsec += NSEC_PER_SEC;
+ then.tv_sec--;
+ }
}
}
-
+
if (uap->mutex_sem == 0)
kern_result = semaphore_timedwait_trap_internal((mach_port_name_t)uap->cond_sem, then.tv_sec, then.tv_nsec, __posix_sem_syscall_return);
else
kern_result = semaphore_timedwait_signal_trap_internal(uap->cond_sem, uap->mutex_sem, then.tv_sec, then.tv_nsec, __posix_sem_syscall_return);
-
+
} else {
-
+
if (uap->mutex_sem == 0)
kern_result = semaphore_wait_trap_internal(uap->cond_sem, __posix_sem_syscall_return);
else
-
+
kern_result = semaphore_wait_signal_trap_internal(uap->cond_sem, uap->mutex_sem, __posix_sem_syscall_return);
}
-
- if (kern_result == KERN_SUCCESS)
+
+ if (kern_result == KERN_SUCCESS && !truncated_timeout)
return(0);
+ else if (kern_result == KERN_SUCCESS && truncated_timeout)
+ return(EINTR); /* simulate an exceptional condition because Mach doesn't support a longer timeout */
+ else if (kern_result == KERN_ABORTED)
+ return(EINTR);
+ else if (kern_result == KERN_OPERATION_TIMED_OUT)
+ return(ETIMEDOUT);
+ else
+ return(EINVAL);
+}
+#endif /* OLD_SEMWAIT_SIGNAL*/
+
+/*
+ * Returns: 0 Success
+ * EINTR
+ * ETIMEDOUT
+ * EINVAL
+ * EFAULT if timespec is NULL
+ */
+int
+__semwait_signal(proc_t p, struct __semwait_signal_args *uap,
+ int32_t *retval)
+{
+ __pthread_testcancel(0);
+ return(__semwait_signal_nocancel(p, (struct __semwait_signal_nocancel_args *)uap, retval));
+}
+
+int
+__semwait_signal_nocancel(__unused proc_t p, struct __semwait_signal_nocancel_args *uap,
+ __unused int32_t *retval)
+{
+
+ kern_return_t kern_result;
+ mach_timespec_t then;
+ struct timespec now;
+ struct user_timespec ts;
+ boolean_t truncated_timeout = FALSE;
+
+ if(uap->timeout) {
+
+ ts.tv_sec = uap->tv_sec;
+ ts.tv_nsec = uap->tv_nsec;
+
+ if ((ts.tv_sec & 0xFFFFFFFF00000000ULL) != 0) {
+ ts.tv_sec = 0xFFFFFFFF;
+ ts.tv_nsec = 0;
+ truncated_timeout = TRUE;
+ }
+
+ if (uap->relative) {
+ then.tv_sec = ts.tv_sec;
+ then.tv_nsec = ts.tv_nsec;
+ } else {
+ nanotime(&now);
+
+ /* if time has elapsed, set time to null timepsec to bailout rightaway */
+ if (now.tv_sec == ts.tv_sec ?
+ now.tv_nsec > ts.tv_nsec :
+ now.tv_sec > ts.tv_sec) {
+ then.tv_sec = 0;
+ then.tv_nsec = 0;
+ } else {
+ then.tv_sec = ts.tv_sec - now.tv_sec;
+ then.tv_nsec = ts.tv_nsec - now.tv_nsec;
+ if (then.tv_nsec < 0) {
+ then.tv_nsec += NSEC_PER_SEC;
+ then.tv_sec--;
+ }
+ }
+ }
+
+ if (uap->mutex_sem == 0)
+ kern_result = semaphore_timedwait_trap_internal((mach_port_name_t)uap->cond_sem, then.tv_sec, then.tv_nsec, __posix_sem_syscall_return);
+ else
+ kern_result = semaphore_timedwait_signal_trap_internal(uap->cond_sem, uap->mutex_sem, then.tv_sec, then.tv_nsec, __posix_sem_syscall_return);
+
+ } else {
+
+ if (uap->mutex_sem == 0)
+ kern_result = semaphore_wait_trap_internal(uap->cond_sem, __posix_sem_syscall_return);
+ else
+
+ kern_result = semaphore_wait_signal_trap_internal(uap->cond_sem, uap->mutex_sem, __posix_sem_syscall_return);
+ }
+
+ if (kern_result == KERN_SUCCESS && !truncated_timeout)
+ return(0);
+ else if (kern_result == KERN_SUCCESS && truncated_timeout)
+ return(EINTR); /* simulate an exceptional condition because Mach doesn't support a longer timeout */
else if (kern_result == KERN_ABORTED)
return(EINTR);
else if (kern_result == KERN_OPERATION_TIMED_OUT)
return(EINVAL);
}
+
int
__pthread_kill(__unused proc_t p, struct __pthread_kill_args *uap,
- __unused register_t *retval)
+ __unused int32_t *retval)
{
thread_t target_act;
int error = 0;
int
__pthread_sigmask(__unused proc_t p, struct __pthread_sigmask_args *uap,
- __unused register_t *retval)
+ __unused int32_t *retval)
{
user_addr_t set = uap->set;
user_addr_t oset = uap->oset;
* copyout:EFAULT
*/
int
-__sigwait(proc_t p, struct __sigwait_args *uap, register_t *retval)
+__sigwait(proc_t p, struct __sigwait_args *uap, int32_t *retval)
{
__pthread_testcancel(1);
return(__sigwait_nocancel(p, (struct __sigwait_nocancel_args *)uap, retval));
}
int
-__sigwait_nocancel(proc_t p, struct __sigwait_nocancel_args *uap, __unused register_t *retval)
+__sigwait_nocancel(proc_t p, struct __sigwait_nocancel_args *uap, __unused int32_t *retval)
{
struct uthread *ut;
struct uthread *uth;
/* No Continuations for now */
error = msleep((caddr_t)&ut->uu_sigwait, &p->p_mlock, PPAUSE|PCATCH, "pause", 0);
- if ((error == EINTR) || (error == ERESTART))
+ if (error == ERESTART)
error = 0;
sigw = (ut->uu_sigwait & siglist);
panic("sigwait with no signal wakeup");
/* Clear the pending signal in the thread it was delivered */
uth->uu_siglist &= ~(sigmask(signum));
+
+#if CONFIG_DTRACE
+ DTRACE_PROC2(signal__clear, int, signum, siginfo_t *, &(ut->t_dtrace_siginfo));
+#endif
+
proc_unlock(p);
if (uap->sig != USER_ADDR_NULL)
error = copyout(&signum, uap->sig, sizeof(int));
}
int
-sigaltstack(__unused proc_t p, struct sigaltstack_args *uap, __unused register_t *retval)
+sigaltstack(__unused proc_t p, struct sigaltstack_args *uap, __unused int32_t *retval)
{
- struct user_sigaltstack ss;
- struct user_sigaltstack *pstk;
+ struct kern_sigaltstack ss;
+ struct kern_sigaltstack *pstk;
int error;
struct uthread *uth;
int onstack;
onstack = pstk->ss_flags & SA_ONSTACK;
if (uap->oss) {
if (IS_64BIT_PROCESS(p)) {
- error = copyout(pstk, uap->oss, sizeof(struct user_sigaltstack));
+ struct user64_sigaltstack ss64;
+ sigaltstack_kern_to_user64(pstk, &ss64);
+ error = copyout(&ss64, uap->oss, sizeof(ss64));
} else {
- struct sigaltstack ss32;
- sigaltstack_64to32(pstk, &ss32);
- error = copyout(&ss32, uap->oss, sizeof(struct sigaltstack));
+ struct user32_sigaltstack ss32;
+ sigaltstack_kern_to_user32(pstk, &ss32);
+ error = copyout(&ss32, uap->oss, sizeof(ss32));
}
if (error)
return (error);
if (uap->nss == USER_ADDR_NULL)
return (0);
if (IS_64BIT_PROCESS(p)) {
- error = copyin(uap->nss, &ss, sizeof(struct user_sigaltstack));
+ struct user64_sigaltstack ss64;
+ error = copyin(uap->nss, &ss64, sizeof(ss64));
+ sigaltstack_user64_to_kern(&ss64, &ss);
} else {
- struct sigaltstack ss32;
- error = copyin(uap->nss, &ss32, sizeof(struct sigaltstack));
- sigaltstack_32to64(&ss32,&ss);
+ struct user32_sigaltstack ss32;
+ error = copyin(uap->nss, &ss32, sizeof(ss32));
+ sigaltstack_user32_to_kern(&ss32, &ss);
}
if (error)
return (error);
}
int
-kill(proc_t cp, struct kill_args *uap, __unused register_t *retval)
+kill(proc_t cp, struct kill_args *uap, __unused int32_t *retval)
{
proc_t p;
kauth_cred_t uc = kauth_cred_get();
int signum = kargp->signum;
int * nfoundp = kargp->nfoundp;
int n;
+ int zombie = 0;
+ int error = 0;
+ if ((kargp->zombie != 0) && ((p->p_listflag & P_LIST_EXITED) == P_LIST_EXITED))
+ zombie = 1;
- if (cansignal(cp, uc, p, signum, 0) == 0)
- return(PROC_RETURNED);
+ if (zombie != 0) {
+ proc_list_lock();
+ error = cansignal(cp, uc, p, signum, zombie);
+ proc_list_unlock();
+
+ if (error != 0 && nfoundp != NULL) {
+ n = *nfoundp;
+ *nfoundp = n+1;
+ }
+ } else {
+ if (cansignal(cp, uc, p, signum, 0) == 0)
+ return(PROC_RETURNED);
- if (nfoundp != NULL) {
- n = *nfoundp;
- *nfoundp = n+1;
+ if (nfoundp != NULL) {
+ n = *nfoundp;
+ *nfoundp = n+1;
+ }
+ if (signum != 0)
+ psignal(p, signum);
}
- if (signum != 0)
- psignal(p, signum);
return(PROC_RETURNED);
-
}
/*
int
killpg1(proc_t cp, int signum, int pgid, int all, int posix)
{
- proc_t p;
kauth_cred_t uc;
struct pgrp *pgrp;
int nfound = 0;
karg.uc = uc;
karg.nfoundp = &nfound;
karg.signum = signum;
+ karg.zombie = 1;
- proc_iterate(PROC_ALLPROCLIST, killpg1_callback, &karg, killpg1_filt, (void *)&kfarg);
- /*
- * Signalling zombies is a no-op, but they must be counted
- * among those processes which have been signalled, since
- * they are still members of the process group.
- */
-
- proc_list_lock();
-
- for (p = zombproc.lh_first; p != 0; p = p->p_list.le_next) {
- if (p->p_pid <= 1 || p->p_flag & P_SYSTEM ||
- (!posix && p == cp) || !cansignal(cp, uc, p, signum, 1))
- continue;
- nfound++;
- }
-
- proc_list_unlock();
+ proc_iterate((PROC_ALLPROCLIST | PROC_ZOMBPROCLIST), killpg1_callback, &karg, killpg1_filt, (void *)&kfarg);
} else {
if (pgid == 0) {
karg.uc = uc;
karg.signum = signum;
karg.cp = cp;
+ karg.zombie = 0;
/* PGRP_DROPREF drops the pgrp refernce */
static int
pgsignal_filt(proc_t p, void * arg)
{
- int checkctty = (int)arg;
+ int checkctty = *(int*)arg;
if ((checkctty == 0) || p->p_flag & P_CONTROLT)
return(1);
static int
pgsignal_callback(proc_t p, void * arg)
{
- int signum = (int)arg;
+ int signum = *(int*)arg;
psignal(p, signum);
return(PROC_RETURNED);
pgsignal(struct pgrp *pgrp, int signum, int checkctty)
{
if (pgrp != PGRP_NULL) {
- pgrp_iterate(pgrp, PGRP_BLOCKITERATE, pgsignal_callback, (void *)signum, pgsignal_filt, (void *)checkctty);
+ pgrp_iterate(pgrp, PGRP_BLOCKITERATE, pgsignal_callback, &signum, pgsignal_filt, &checkctty);
}
}
pg = tty_pgrp(tp);
if (pg != PGRP_NULL) {
- pgrp_iterate(pg, PGRP_BLOCKITERATE, pgsignal_callback, (void *)signum, pgsignal_filt, (void *)checkctty);
+ pgrp_iterate(pg, PGRP_BLOCKITERATE, pgsignal_callback, &signum, pgsignal_filt, &checkctty);
pg_rele(pg);
}
}
p = (proc_t)(get_bsdtask_info(sig_task));
uth = get_bsdthread_info(sig_actthread);
- if (uth && (uth->uu_flag & UT_VFORK))
+ if (uth->uu_flag & UT_VFORK)
p = uth->uu_proc;
proc_lock(p);
psignal_internal(proc_t p, task_t task, thread_t thread, int flavor, int signum)
{
int prop;
- sig_t action = NULL;
+ user_addr_t action = USER_ADDR_NULL;
proc_t sig_proc;
thread_t sig_thread;
register task_t sig_task;
if (flavor & PSIG_VFORK) {
sig_task = task;
sig_thread = thread;
- sig_proc= p;
+ sig_proc = p;
} else if (flavor & PSIG_THREAD) {
sig_task = get_threadtask(thread);
sig_thread = thread;
sig_proc = (proc_t)get_bsdtask_info(sig_task);
} else {
sig_task = p->task;
- sig_proc = p;
sig_thread = (struct thread *)0;
+ sig_proc = p;
}
- if (((sig_task == TASK_NULL) || is_kerneltask(sig_task))) {
+
+ if ((sig_task == TASK_NULL) || is_kerneltask(sig_task))
return;
- }
/*
* do not send signals to the process that has the thread
* doing a reboot(). Not doing so will mark that thread aborted
- * and can cause IO failures wich will cause data loss.
+ * and can cause IO failures wich will cause data loss. There's
+ * also no need to send a signal to a process that is in the middle
+ * of being torn down.
*/
- if (ISSET(sig_proc->p_flag, P_REBOOT)) {
+ if (ISSET(sig_proc->p_flag, P_REBOOT) ||
+ ISSET(sig_proc->p_lflag, P_LEXIT))
return;
- }
if( (flavor & (PSIG_VFORK | PSIG_THREAD)) == 0) {
proc_knote(sig_proc, NOTE_SIGNAL | signum);
}
-
if ((flavor & PSIG_LOCKED)== 0)
proc_signalstart(sig_proc, 0);
goto runlocked;
if (action == KERN_SIG_WAIT) {
+#if CONFIG_DTRACE
+ /*
+ * DTrace proc signal-clear returns a siginfo_t. Collect the needed info.
+ */
+ r_uid = kauth_getruid(); /* per thread credential; protected by our thread context */
+
+ bzero((caddr_t)&(uth->t_dtrace_siginfo), sizeof(uth->t_dtrace_siginfo));
+
+ uth->t_dtrace_siginfo.si_signo = signum;
+ uth->t_dtrace_siginfo.si_pid = current_proc()->p_pid;
+ uth->t_dtrace_siginfo.si_status = W_EXITCODE(signum, 0);
+ uth->t_dtrace_siginfo.si_uid = r_uid;
+ uth->t_dtrace_siginfo.si_code = 0;
+#endif
uth->uu_sigwait = mask;
uth->uu_siglist &= ~mask;
wakeup(&uth->uu_sigwait);
/* if it is SIGCONT resume whole process */
if (prop & SA_CONT) {
- OSBitOrAtomic(P_CONTINUED, (UInt32 *)&sig_proc->p_flag);
+ OSBitOrAtomic(P_CONTINUED, &sig_proc->p_flag);
sig_proc->p_contproc = current_proc()->p_pid;
proc_unlock(sig_proc);
- (void) task_resume(sig_task);
+ (void) task_resume_internal(sig_task);
goto psigout;
}
proc_unlock(sig_proc);
* (except for SIGCONT).
*/
if (prop & SA_CONT) {
- OSBitOrAtomic(P_CONTINUED, (UInt32 *)&sig_proc->p_flag);
+ OSBitOrAtomic(P_CONTINUED, &sig_proc->p_flag);
proc_unlock(sig_proc);
- (void) task_resume(sig_task);
+ (void) task_resume_internal(sig_task);
proc_lock(sig_proc);
sig_proc->p_stat = SRUN;
} else if (sig_proc->p_stat == SSTOP) {
if (sig_proc->p_stat != SSTOP) {
sig_proc->p_xstat = signum;
sig_proc->p_stat = SSTOP;
- OSBitAndAtomic(~((uint32_t)P_CONTINUED), (UInt32 *)&sig_proc->p_flag);
+ OSBitAndAtomic(~((uint32_t)P_CONTINUED), &sig_proc->p_flag);
sig_proc->p_lflag &= ~P_LWAITED;
proc_unlock(sig_proc);
if (( pp != PROC_NULL) && ((pp->p_flag & P_NOCLDSTOP) == 0)) {
my_cred = kauth_cred_proc_ref(sig_proc);
- r_uid = my_cred->cr_ruid;
+ r_uid = kauth_cred_getruid(my_cred);
kauth_cred_unref(&my_cred);
proc_lock(sig_proc);
* Process will be running after 'run'
*/
sig_proc->p_stat = SRUN;
- proc_unlock(sig_proc);
+ /*
+ * In scenarios where suspend/resume are racing
+ * the signal we are missing AST_BSD by the time
+ * we get here, set again to avoid races. This
+ * was the scenario with spindump enabled shutdowns.
+ * We would need to cover this approp down the line.
+ */
+ act_set_astbsd(sig_thread);
thread_abort(sig_thread);
+ proc_unlock(sig_proc);
goto psigout;
* Let the process run. If it's sleeping on an
* event, it remains so.
*/
- OSBitOrAtomic(P_CONTINUED, (UInt32 *)&sig_proc->p_flag);
+ OSBitOrAtomic(P_CONTINUED, &sig_proc->p_flag);
sig_proc->p_contproc = sig_proc->p_pid;
proc_unlock(sig_proc);
- (void) task_resume(sig_task);
+ (void) task_resume_internal(sig_task);
proc_lock(sig_proc);
/*
* When processing a SIGCONT, we need to check
* postsig(signum);
*/
int
-issignal(proc_t p)
+issignal_locked(proc_t p)
{
int signum, mask, prop, sigbits;
thread_t cur_act;
ram_printf(3);
}
#endif /* SIGNAL_DEBUG */
- proc_lock(p);
/*
* Try to grab the signal lock.
*/
if (sig_try_locked(p) <= 0) {
- proc_unlock(p);
return(0);
}
p->sigwait = TRUE;
p->sigwait_thread = cur_act;
p->p_stat = SSTOP;
- OSBitAndAtomic(~((uint32_t)P_CONTINUED), (UInt32 *)&p->p_flag);
+ OSBitAndAtomic(~((uint32_t)P_CONTINUED), &p->p_flag);
p->p_lflag &= ~P_LWAITED;
ut->uu_siglist &= ~mask; /* clear the old signal */
proc_signalend(p, 1);
} else {
proc_unlock(p);
my_cred = kauth_cred_proc_ref(p);
- r_uid = my_cred->cr_ruid;
+ r_uid = kauth_cred_getruid(my_cred);
kauth_cred_unref(&my_cred);
pp = proc_parentholdref(p);
/*
* XXX Have to really stop for debuggers;
* XXX stop() doesn't do the right thing.
- * XXX Inline the task_suspend because we
- * XXX have to diddle Unix state in the
- * XXX middle of it.
*/
task = p->task;
- task_suspend(task);
+ task_suspend_internal(task);
proc_lock(p);
p->sigwait = TRUE;
p->sigwait_thread = cur_act;
p->p_stat = SSTOP;
- OSBitAndAtomic(~((uint32_t)P_CONTINUED), (UInt32 *)&p->p_flag);
+ OSBitAndAtomic(~((uint32_t)P_CONTINUED), &p->p_flag);
p->p_lflag &= ~P_LWAITED;
ut->uu_siglist &= ~mask; /* clear the old signal */
*/
proc_signalend(p, 1);
proc_unlock(p);
+ KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_PROC, BSD_PROC_FRCEXIT) | DBG_FUNC_NONE,
+ p->p_pid, W_EXITCODE(0, SIGKILL), 2, 0, 0);
exit1(p, W_EXITCODE(0, SIGKILL), (int *)NULL);
+ proc_lock(p);
return(0);
}
stop(p, pp);
if ((pp != PROC_NULL) && ((pp->p_flag & P_NOCLDSTOP) == 0)) {
my_cred = kauth_cred_proc_ref(p);
- r_uid = my_cred->cr_ruid;
+ r_uid = kauth_cred_getruid(my_cred);
kauth_cred_unref(&my_cred);
proc_lock(pp);
}
/* NOTREACHED */
out:
- proc_signalend(p,1);
- proc_unlock(p);
+ proc_signalend(p, 1);
return(retval);
}
signum = ffs((long)sigbits);
mask = sigmask(signum);
prop = sigprop[signum];
+ sigbits &= ~mask; /* take the signal out */
/*
* We should see pending but ignored signals
if (mask & p->p_sigignore && (p->p_lflag & P_LTRACED) == 0) {
continue;
}
+
if (p->p_lflag & P_LTRACED && (p->p_lflag & P_LPPWAIT) == 0) {
- /*
- * Put the new signal into p_siglist. If the
- * signal is being masked, look for other signals.
- */
- mask = sigmask(signum);
- if (ut->uu_sigmask & mask)
- continue;
return(signum);
}
*/
return (signum);
}
- sigbits &= ~mask; /* take the signal! */
}
/* NOTREACHED */
}
static void
stop(proc_t p, proc_t parent)
{
- OSBitAndAtomic(~((uint32_t)P_CONTINUED), (UInt32 *)&p->p_flag);
+ OSBitAndAtomic(~((uint32_t)P_CONTINUED), &p->p_flag);
if ((parent != PROC_NULL) && (parent->p_stat != SSTOP)) {
proc_list_lock();
wakeup((caddr_t)parent);
proc_list_unlock();
}
- (void) task_suspend(p->task); /*XXX*/
+ (void) task_suspend_internal(p->task);
}
/*
* from the current set of pending signals.
*/
void
-postsig(int signum)
+postsig_locked(int signum)
{
proc_t p = current_proc();
struct sigacts *ps = p->p_sigacts;
user_addr_t catcher;
- u_long code;
+ uint32_t code;
int mask, returnmask;
struct uthread * ut;
panic("psig not on master");
#endif
- proc_lock(p);
/*
* Try to grab the signal lock.
*/
if (sig_try_locked(p) <= 0) {
- proc_unlock(p);
return;
}
* Default catcher, where the default is to kill
* the process. (Other cases were ignored above.)
*/
- siginfo_t sinfo;
- bzero((caddr_t)&sinfo, sizeof(siginfo_t));
-
sig_lock_to_exit(p);
p->p_acflag |= AXSIG;
if (sigprop[signum] & SA_CORE) {
p->p_sigacts->ps_sig = signum;
proc_signalend(p, 1);
proc_unlock(p);
- if (coredump(p) == 0)
+ if (coredump(p, 0, 0) == 0)
signum |= WCOREFLAG;
} else {
proc_signalend(p, 1);
proc_unlock(p);
}
- sinfo.si_signo = signum;
- sinfo.si_pid = p->si_pid;
- sinfo.si_uid = p->si_uid;
- sinfo.si_status = WEXITSTATUS(p->si_status);
+#if CONFIG_DTRACE
+ bzero((caddr_t)&(ut->t_dtrace_siginfo), sizeof(ut->t_dtrace_siginfo));
- DTRACE_PROC3(signal__handle, int, signum, siginfo_t *, &sinfo,
+ ut->t_dtrace_siginfo.si_signo = signum;
+ ut->t_dtrace_siginfo.si_pid = p->si_pid;
+ ut->t_dtrace_siginfo.si_uid = p->si_uid;
+ ut->t_dtrace_siginfo.si_status = WEXITSTATUS(p->si_status);
+
+ /* Fire DTrace proc:::fault probe when signal is generated by hardware. */
+ switch (signum) {
+ case SIGILL: case SIGBUS: case SIGSEGV: case SIGFPE: case SIGTRAP:
+ DTRACE_PROC2(fault, int, (int)(ut->uu_code), siginfo_t *, &(ut->t_dtrace_siginfo));
+ break;
+ default:
+ break;
+ }
+
+
+ DTRACE_PROC3(signal__handle, int, signum, siginfo_t *, &(ut->t_dtrace_siginfo),
void (*)(void), SIG_DFL);
+#endif
+ KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_PROC, BSD_PROC_FRCEXIT) | DBG_FUNC_NONE,
+ p->p_pid, W_EXITCODE(0, signum), 3, 0, 0);
exit1(p, W_EXITCODE(0, signum), (int *)NULL);
+ proc_lock(p);
return;
} else {
/*
ps->ps_siginfo &= ~mask;
ps->ps_signodefer &= ~mask;
}
-#ifdef __ppc__
- /* Needs to disable to run in user mode */
- if (signum == SIGFPE) {
- thread_enable_fpe(current_thread(), 0);
- }
-#endif /* __ppc__ */
if (ps->ps_sig != signum) {
code = 0;
code = ps->ps_code;
ps->ps_code = 0;
}
- OSIncrementAtomic(&p->p_stats->p_ru.ru_nsignals);
+ OSIncrementAtomicLong(&p->p_stats->p_ru.ru_nsignals);
sendsig(p, catcher, signum, returnmask, code);
}
proc_signalend(p, 1);
- proc_unlock(p);
}
/*
return (kn->kn_data != 0);
}
+static void
+filt_signaltouch(struct knote *kn, struct kevent64_s *kev, long type)
+{
+ proc_klist_lock();
+ switch (type) {
+ case EVENT_REGISTER:
+ kn->kn_sfflags = kev->fflags;
+ kn->kn_sdata = kev->data;
+ break;
+ case EVENT_PROCESS:
+ *kev = kn->kn_kevent;
+ if (kn->kn_flags & EV_CLEAR) {
+ kn->kn_data = 0;
+ kn->kn_fflags = 0;
+ }
+ break;
+ default:
+ panic("filt_machporttouch() - invalid type (%ld)", type);
+ break;
+ }
+ proc_klist_unlock();
+}
+
void
bsd_ast(thread_t thread)
{
if ((p->p_flag & P_OWEUPC) && (p->p_flag & P_PROFIL)) {
pc = get_useraddr();
addupc_task(p, pc, 1);
- OSBitAndAtomic(~((uint32_t)P_OWEUPC), (UInt32 *)&p->p_flag);
+ OSBitAndAtomic(~((uint32_t)P_OWEUPC), &p->p_flag);
}
if (timerisset(&p->p_vtimer_user.it_value)) {
task_vtimer_clear(p->task, TASK_VTIMER_USER);
psignal(p, SIGVTALRM);
- }
+ }
}
if (timerisset(&p->p_vtimer_prof.it_value)) {
psignal(p, SIGPROF);
}
-}
+ }
if (timerisset(&p->p_rlim_cpu)) {
struct timeval tv;
}
}
+#if CONFIG_DTRACE
+ if (ut->t_dtrace_sig) {
+ uint8_t dt_action_sig = ut->t_dtrace_sig;
+ ut->t_dtrace_sig = 0;
+ psignal(p, dt_action_sig);
+ }
+
+ if (ut->t_dtrace_stop) {
+ ut->t_dtrace_stop = 0;
+ proc_lock(p);
+ p->p_dtrace_stop = 1;
+ proc_unlock(p);
+ (void)task_suspend_internal(p->task);
+ }
+
+ if (ut->t_dtrace_resumepid) {
+ proc_t resumeproc = proc_find(ut->t_dtrace_resumepid);
+ ut->t_dtrace_resumepid = 0;
+ if (resumeproc != PROC_NULL) {
+ proc_lock(resumeproc);
+ /* We only act on processes stopped by dtrace */
+ if (resumeproc->p_dtrace_stop) {
+ resumeproc->p_dtrace_stop = 0;
+ proc_unlock(resumeproc);
+ task_resume_internal(resumeproc->task);
+ }
+ else {
+ proc_unlock(resumeproc);
+ }
+ proc_rele(resumeproc);
+ }
+ }
+
+#endif /* CONFIG_DTRACE */
+
+ proc_lock(p);
if (CHECK_SIGNALS(p, current_thread(), ut)) {
- while ( (signum = issignal(p)) )
- postsig(signum);
+ while ( (signum = issignal_locked(p)) )
+ postsig_locked(signum);
}
+ proc_unlock(p);
if (!bsd_init_done) {
bsd_init_done = 1;
}
-/* ptrace set runnalbe */
+/* ptrace set runnable */
void
pt_setrunnable(proc_t p)
{
proc_unlock(p);
if (p->sigwait) {
wakeup((caddr_t)&(p->sigwait));
- task_release(task);
+ if ((p->p_lflag & P_LSIGEXC) == 0) { // 5878479
+ task_release(task);
+ }
}
}
}
proc_rele(p);
}
-
void
proc_signalstart(proc_t p, int locked)
{
- if (locked == 0)
+ if (!locked)
proc_lock(p);
- while ((p->p_lflag & P_LINSIGNAL) == P_LINSIGNAL) {
- p->p_lflag |= P_LSIGNALWAIT;
+
+ if(p->p_signalholder == current_thread())
+ panic("proc_signalstart: thread attempting to signal a process for which it holds the signal lock");
+
+ p->p_sigwaitcnt++;
+ while ((p->p_lflag & P_LINSIGNAL) == P_LINSIGNAL)
msleep(&p->p_sigmask, &p->p_mlock, 0, "proc_signstart", NULL);
- }
+ p->p_sigwaitcnt--;
+
p->p_lflag |= P_LINSIGNAL;
-#if DIAGNOSTIC
-#if SIGNAL_DEBUG
-#ifdef __ppc__
- {
- int sp, *fp, numsaved;
-
- __asm__ volatile("mr %0,r1" : "=r" (sp));
-
- fp = (int *)*((int *)sp);
- for (numsaved = 0; numsaved < 3; numsaved++) {
- p->lockpc[numsaved] = fp[2];
- if ((int)fp <= 0)
- break;
- fp = (int *)*fp;
- }
- }
-#endif /* __ppc__ */
-#endif /* SIGNAL_DEBUG */
-#endif /* DIAGNOSTIC */
p->p_signalholder = current_thread();
- if (locked == 0)
+ if (!locked)
proc_unlock(p);
-
}
void
proc_signalend(proc_t p, int locked)
{
- if (locked == 0)
+ if (!locked)
proc_lock(p);
p->p_lflag &= ~P_LINSIGNAL;
-#if DIAGNOSTIC
-#if SIGNAL_DEBUG
-#ifdef __ppc__
- {
- int sp, *fp, numsaved;
-
- __asm__ volatile("mr %0,r1" : "=r" (sp));
-
- fp = (int *)*((int *)sp);
- for (numsaved = 0; numsaved < 3; numsaved++) {
- p->unlockpc[numsaved] = fp[2];
- if ((int)fp <= 0)
- break;
- fp = (int *)*fp;
- }
- }
-#endif /* __ppc__ */
-#endif /* SIGNAL_DEBUG */
-#endif /* DIAGNOSTIC */
-
- if ((p->p_lflag & P_LSIGNALWAIT) == P_LSIGNALWAIT) {
- p->p_lflag &= ~P_LSIGNALWAIT;
+ if (p->p_sigwaitcnt > 0)
wakeup(&p->p_sigmask);
- }
+
p->p_signalholder = NULL;
- if (locked == 0)
+ if (!locked)
proc_unlock(p);
}
-
void
sig_lock_to_exit(proc_t p)
{
p->exit_thread = self;
proc_unlock(p);
- (void) task_suspend(p->task);
+
+ task_hold(p->task);
+ task_wait(p->task, FALSE);
+
proc_lock(p);
}
projects / apple / xnu.git / blobdiff