d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix POSIX compatible bug for sigwaitinfo and sigtimedwait.

Browse Source 
POSIX says siginfo pointer parameter can be NULL and if the
function success, it should return signal number but not zero.
The waitset it past should be negatived before it can be
used as thread signal mask.
This commit is contained in:
David Xu 2003-06-28 08:03:28 +00:00
parent cf8603ce44
commit 418228df24
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/kern/kern_sig.c
View File

@ -776,13 +776,15 @@ sigtimedwait(struct thread *td, struct sigtimedwait_args *uap)
error = kern_sigtimedwait(td, set, &info, timeout);
if (error)
return (error);
error = copyout(&info, uap->info, sizeof(info));
if (uap->info)
error = copyout(&info, uap->info, sizeof(info));
/* Repost if we got an error. */
if (error && info.si_signo) {
PROC_LOCK(td->td_proc);
tdsignal(td, info.si_signo);
PROC_UNLOCK(td->td_proc);
} else {
td->td_retval[0] = info.si_signo;
}
return (error);
}
@ -805,12 +807,15 @@ sigwaitinfo(struct thread *td, struct sigwaitinfo_args *uap)
if (error)
return (error);
error = copyout(&info, uap->info, sizeof(info));
if (uap->info)
error = copyout(&info, uap->info, sizeof(info));
/* Repost if we got an error. */
if (error && info.si_signo) {
PROC_LOCK(td->td_proc);
tdsignal(td, info.si_signo);
PROC_UNLOCK(td->td_proc);
} else {
td->td_retval[0] = info.si_signo;
}
return (error);
}
@ -834,7 +839,9 @@ kern_sigtimedwait(struct thread *td, sigset_t set, siginfo_t *info,
PROC_LOCK(p);
ps = p->p_sigacts;
oldmask = td->td_sigmask;
td->td_sigmask = set;
SIGFILLSET(td->td_sigmask);
SIG_CANTMASK(td->td_sigmask);
SIGSETNAND(td->td_sigmask, set);
signotify(td);
mtx_lock(&ps->ps_mtx);