diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2011-07-05 04:48:03 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2011-07-05 04:48:03 +0000 |
| commit | 0e36778a06f5746ef60cadc41c445d6f5b6cc647 (patch) | |
| tree | 28f4fa5e7600b312b1d6084db8548e11c7f9d783 /sys/arch/sparc64 | |
| parent | a7942e7ec8d68c52b4e9833fffb6c7810fde7f15 (diff) | |
Recommit the reverted sigacts change now that the NFS use-after-free
problem has been tracked down. This fixes the sharing of the signal
handling state: shared bits go in sigacts, per-rthread bits goes in
struct proc.
ok deraadt@
Diffstat (limited to 'sys/arch/sparc64')
| -rw-r--r-- | sys/arch/sparc64/sparc64/machdep.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c index 024f96b3a08..2130f5d4818 100644 --- a/sys/arch/sparc64/sparc64/machdep.c +++ b/sys/arch/sparc64/sparc64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.135 2011/06/26 22:40:00 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.136 2011/07/05 04:48:02 guenther Exp $ */ /* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */ /*- @@ -442,13 +442,13 @@ sendsig(catcher, sig, mask, code, type, val) * Compute new user stack addresses, subtract off * one signal frame, and align. */ - onstack = psp->ps_sigstk.ss_flags & SS_ONSTACK; + onstack = p->p_sigstk.ss_flags & SS_ONSTACK; - if ((psp->ps_flags & SAS_ALTSTACK) && !onstack && + if ((p->p_sigstk.ss_flags & SS_DISABLE) == 0 && !onstack && (psp->ps_sigonstack & sigmask(sig))) { - fp = (struct sigframe *)((caddr_t)psp->ps_sigstk.ss_sp + - psp->ps_sigstk.ss_size); - psp->ps_sigstk.ss_flags |= SS_ONSTACK; + fp = (struct sigframe *)((caddr_t)p->p_sigstk.ss_sp + + p->p_sigstk.ss_size); + p->p_sigstk.ss_flags |= SS_ONSTACK; } else fp = (struct sigframe *)oldsp; /* Allocate an aligned sigframe */ @@ -594,9 +594,9 @@ sys_sigreturn(p, v, retval) /* Restore signal stack. */ if (sc.sc_onstack & SS_ONSTACK) - p->p_sigacts->ps_sigstk.ss_flags |= SS_ONSTACK; + p->p_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigacts->ps_sigstk.ss_flags &= ~SS_ONSTACK; + p->p_sigstk.ss_flags &= ~SS_ONSTACK; /* Restore signal mask. */ p->p_sigmask = scp->sc_mask & ~sigcantmask; |