diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2011-04-18 21:44:57 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2011-04-18 21:44:57 +0000 |
| commit | bce64c2a24fb4484b18813bef367dcc71e8a0dd0 (patch) | |
| tree | dfc7f71507d6c603255802772ca128609460ca08 /sys/arch/arm | |
| parent | fd1b35e57ce1fdce5ec1dc979ff36b7649cab0c5 (diff) | |
Revert the sigacts diff: NFS can apparently retain pointers to processes
until they're zombies and then send them signals (for intr mounts). Until
that is untangled, the sigacts change is unsafe. sthen@ was the victim
for this one
Diffstat (limited to 'sys/arch/arm')
| -rw-r--r-- | sys/arch/arm/arm/sig_machdep.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sys/arch/arm/arm/sig_machdep.c b/sys/arch/arm/arm/sig_machdep.c index fb6447e89c4..7181b17b47c 100644 --- a/sys/arch/arm/arm/sig_machdep.c +++ b/sys/arch/arm/arm/sig_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sig_machdep.c,v 1.4 2011/04/16 02:34:19 deraadt Exp $ */ +/* $OpenBSD: sig_machdep.c,v 1.5 2011/04/18 21:44:55 guenther Exp $ */ /* $NetBSD: sig_machdep.c,v 1.22 2003/10/08 00:28:41 thorpej Exp $ */ /* @@ -87,7 +87,7 @@ sendsig(sig_t catcher, int sig, int returnmask, u_long code, int type, struct trapframe *tf; struct sigframe *fp, frame; struct sigacts *psp = p->p_sigacts; - int oonstack = p->p_sigstk.ss_flags & SS_ONSTACK; + int oonstack = psp->ps_sigstk.ss_flags & SS_ONSTACK; int onstack = 0; tf = process_frame(p); @@ -95,11 +95,11 @@ sendsig(sig_t catcher, int sig, int returnmask, u_long code, int type, /* Do we need to jump onto the signal stack? */ /* Allocate space for the signal handler context. */ - if ((p->p_sigstk.ss_flags & SS_DISABLE) == 0 && !oonstack && + if ((psp->ps_flags & SAS_ALTSTACK) && !oonstack && (psp->ps_sigonstack & sigmask(sig))) { onstack = 1; - fp = (struct sigframe *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size); + fp = (struct sigframe *)((caddr_t)psp->ps_sigstk.ss_sp + + psp->ps_sigstk.ss_size); } else fp = (struct sigframe *)tf->tf_usr_sp; /* make room on the stack */ @@ -135,7 +135,7 @@ sendsig(sig_t catcher, int sig, int returnmask, u_long code, int type, frame.sf_sc.sc_spsr = tf->tf_spsr; /* Save signal stack. */ - frame.sf_sc.sc_onstack = p->p_sigstk.ss_flags & SS_ONSTACK; + frame.sf_sc.sc_onstack = psp->ps_sigstk.ss_flags & SS_ONSTACK; /* Save signal mask. */ frame.sf_sc.sc_mask = returnmask; @@ -177,7 +177,7 @@ sendsig(sig_t catcher, int sig, int returnmask, u_long code, int type, /* Remember that we're now on the signal stack. */ if (onstack) - p->p_sigstk.ss_flags |= SS_ONSTACK; + psp->ps_sigstk.ss_flags |= SS_ONSTACK; } #if 0 @@ -216,6 +216,7 @@ sys_sigreturn(struct proc *p, void *v, register_t *retval) } */ *uap = v; struct sigcontext *scp, context; struct trapframe *tf; + struct sigacts *psp = p->p_sigacts; /* * we do a rather scary test in userland @@ -269,9 +270,9 @@ sys_sigreturn(struct proc *p, void *v, register_t *retval) /* Restore signal stack. */ if (context.sc_onstack & SS_ONSTACK) - p->p_sigstk.ss_flags |= SS_ONSTACK; + psp->ps_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + psp->ps_sigstk.ss_flags &= ~SS_ONSTACK; /* Restore signal mask. */ #if 0 |