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

Avoid copying memory if SIGCANCEL is not masked.

Browse Source
This commit is contained in:
David Xu 2013-04-18 05:56:00 +00:00
parent 880659fe81
commit 8bbeb7e9e0
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libthr/thread/thr_sig.c
View File

@ -732,8 +732,12 @@ _setcontext(const ucontext_t *ucp)
{
ucontext_t uc;
if (ucp == NULL)
return (EINVAL);
if (!SIGISMEMBER(uc.uc_sigmask, SIGCANCEL))
return __sys_setcontext(ucp);
(void) memcpy(&uc, ucp, sizeof(uc));
remove_thr_signals(&uc.uc_sigmask);
SIGDELSET(uc.uc_sigmask, SIGCANCEL);
return __sys_setcontext(&uc);
}
@ -743,7 +747,13 @@ _swapcontext(ucontext_t *oucp, const ucontext_t *ucp)
{
ucontext_t uc;
(void) memcpy(&uc, ucp, sizeof(uc));
remove_thr_signals(&uc.uc_sigmask);
return __sys_swapcontext(oucp, &uc);
if (oucp == NULL || ucp == NULL)
return (EINVAL);
if (SIGISMEMBER(ucp->uc_sigmask, SIGCANCEL)) {
stdout_debug("remove SIGCANCEL\n");
(void) memcpy(&uc, ucp, sizeof(uc));
SIGDELSET(uc.uc_sigmask, SIGCANCEL);
ucp = &uc;
}
return __sys_swapcontext(oucp, ucp);
}