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/kern/kern_context.c | |
| 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/kern/kern_context.c')
| -rw-r--r-- | sys/kern/kern_context.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sys/kern/kern_context.c b/sys/kern/kern_context.c index f951fca..6628eb6 100644 --- a/sys/kern/kern_context.c +++ b/sys/kern/kern_context.c @@ -89,10 +89,8 @@ setcontext(struct thread *td, struct setcontext_args *uap) if (ret == 0) { ret = set_mcontext(td, &uc.uc_mcontext); if (ret == 0) { - SIG_CANTMASK(uc.uc_sigmask); - PROC_LOCK(td->td_proc); - td->td_sigmask = uc.uc_sigmask; - PROC_UNLOCK(td->td_proc); + kern_sigprocmask(td, SIG_SETMASK, &uc.uc_sigmask, + NULL, 0); } } } @@ -118,10 +116,8 @@ swapcontext(struct thread *td, struct swapcontext_args *uap) if (ret == 0) { ret = set_mcontext(td, &uc.uc_mcontext); if (ret == 0) { - SIG_CANTMASK(uc.uc_sigmask); - PROC_LOCK(td->td_proc); - td->td_sigmask = uc.uc_sigmask; - PROC_UNLOCK(td->td_proc); + kern_sigprocmask(td, SIG_SETMASK, + &uc.uc_sigmask, NULL, 0); } } } |
