qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(sigcancel_handler): Change parameters to match handler for SA_SIGACTION. Check signal number and code to recognize invalid invocations.

This commit is contained in:
Ulrich Drepper 2003-07-05 06:18:19 +00:00
parent bdbecaa3f1
commit a1ed6b4cab
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nptl/init.c
View File

@ -132,8 +132,19 @@ static struct pthread_functions pthread_functions =
/* For asynchronous cancellation we use a signal. This is the handler. */ /* For asynchronous cancellation we use a signal. This is the handler. */
static void static void
sigcancel_handler (int sig __attribute ((unused))) sigcancel_handler (int sig, siginfo_t *si, void *ctx)
{ {
/* Safety check. It would be possible to call this function for
other signals and send a signal from another thread. This is not
correct and might even be a security problem. Try to catch as
many incorrect invocations as possible. */
if (sig != SIGCANCEL
|| si->si_code != SI_TKILL)
/* XXX The Linux kernel currently does not report the correct PID
in the si->si_pid field. Once this is changed another test
will be added. */
return;
struct pthread *self = THREAD_SELF; struct pthread *self = THREAD_SELF;
int oldval = THREAD_GETMEM (self, cancelhandling); int oldval = THREAD_GETMEM (self, cancelhandling);
@ -209,8 +220,8 @@ __pthread_initialize_minimal_internal (void)
cannot install the handler we do not abort. Maybe we should, but cannot install the handler we do not abort. Maybe we should, but
it is only asynchronous cancellation which is affected. */ it is only asynchronous cancellation which is affected. */
struct sigaction sa; struct sigaction sa;
sa.sa_handler = sigcancel_handler; sa.sa_sigaction = sigcancel_handler;
sa.sa_flags = 0; sa.sa_flags = SA_SIGINFO;
sigemptyset (&sa.sa_mask); sigemptyset (&sa.sa_mask);
(void) __libc_sigaction (SIGCANCEL, &sa, NULL); (void) __libc_sigaction (SIGCANCEL, &sa, NULL);