diff options
| author | kib <kib@FreeBSD.org> | 2009-10-27 10:47:58 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2009-10-27 10:47:58 +0000 |
| commit | ce081b037e7a762f0dd090a207cafc5121f39f51 (patch) | |
| tree | 359a5b0885ae5a789f55ba40dc485621e67c34b1 /sys/arm | |
| parent | eb4c68098b66d84de3abc7be00acfdc6d2f8f980 (diff) | |
| download | FreeBSD-src-ce081b037e7a762f0dd090a207cafc5121f39f51.zip FreeBSD-src-ce081b037e7a762f0dd090a207cafc5121f39f51.tar.gz | |
In r197963, a race with thread being selected for signal delivery
while in kernel mode, and later changing signal mask to block the
signal, was fixed for sigprocmask(2) and ptread_exit(3). The same race
exists for sigreturn(2), setcontext(2) and swapcontext(2) syscalls.
Use kern_sigprocmask() instead of direct manipulation of td_sigmask to
reschedule newly blocked signals, closing the race.
Reviewed by: davidxu
Tested by: pho
MFC after: 1 month
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/arm/machdep.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c index 597cdf5..f49319e 100644 --- a/sys/arm/arm/machdep.c +++ b/sys/arm/arm/machdep.c @@ -605,7 +605,6 @@ sigreturn(td, uap) const struct __ucontext *sigcntxp; } */ *uap; { - struct proc *p = td->td_proc; struct sigframe sf; struct trapframe *tf; int spsr; @@ -627,11 +626,7 @@ sigreturn(td, uap) set_mcontext(td, &sf.sf_uc.uc_mcontext); /* Restore signal mask. */ - PROC_LOCK(p); - td->td_sigmask = sf.sf_uc.uc_sigmask; - SIG_CANTMASK(td->td_sigmask); - signotify(td); - PROC_UNLOCK(p); + kern_sigprocmask(td, SIG_SETMASK, &sf.sf_uc.uc_sigmask, NULL, 0); return (EJUSTRETURN); } |
