diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-09-28 22:44:12 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-09-28 22:44:12 +0000 |
| commit | 53b4fed6efb980044ff7152c725557de846a23bf (patch) | |
| tree | 74d7b2cd655d39da0d24cdf0c37d3edc2b7980d6 /nptl/sysdeps | |
| parent | 6c81dc423b333d871a16083c74e42be68516e8e2 (diff) | |
| download | glibc-53b4fed6efb980044ff7152c725557de846a23bf.zip glibc-53b4fed6efb980044ff7152c725557de846a23bf.tar.gz glibc-53b4fed6efb980044ff7152c725557de846a23bf.tar.bz2 | |
Update.
* sysdeps/unix/sysv/linux/sigwait.c (do_sigwait): Make sure
SIGSETXID is not blocked.
* sysdeps/unix/sysv/linux/sigwaitinfo.c (do_sigwaitinfo): Likewise.
* sysdeps/unix/sysv/linux/sigtimedwait.c (do_sigtimedwait): Likewise.
* sysdeps/unix/sysv/linux/sigprocmask.c (__sigprocmask): Likewise.
* sysdeps/generic/sigfillset.c (sigfillset): Don't set SIGSETXID.
Diffstat (limited to 'nptl/sysdeps')
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_sigmask.c | 10 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/sigaction.c | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/pthread_kill.c | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/nptl/sysdeps/pthread/pthread_sigmask.c b/nptl/sysdeps/pthread/pthread_sigmask.c index efe186a..0d12fe6 100644 --- a/nptl/sysdeps/pthread/pthread_sigmask.c +++ b/nptl/sysdeps/pthread/pthread_sigmask.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -31,13 +31,15 @@ pthread_sigmask (how, newmask, oldmask) { sigset_t local_newmask; - /* The only thing we have to make sure here is that SIGCANCEL is not - blocked. */ + /* The only thing we have to make sure here is that SIGCANCEL and + SIGSETXID is not blocked. */ if (newmask != NULL - && __builtin_expect (__sigismember (newmask, SIGCANCEL), 0)) + && (__builtin_expect (__sigismember (newmask, SIGCANCEL), 0) + || __builtin_expect (__sigismember (newmask, SIGSETXID), 0))) { local_newmask = *newmask; __sigdelset (&local_newmask, SIGCANCEL); + __sigdelset (&local_newmask, SIGSETXID); newmask = &local_newmask; } diff --git a/nptl/sysdeps/pthread/sigaction.c b/nptl/sysdeps/pthread/sigaction.c index 392cb65..4d36150 100644 --- a/nptl/sysdeps/pthread/sigaction.c +++ b/nptl/sysdeps/pthread/sigaction.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -36,7 +36,7 @@ __sigaction (sig, act, oact) const struct sigaction *act; struct sigaction *oact; { - if (sig == SIGCANCEL) + if (__builtin_expect (sig == SIGCANCEL || sig == SIGSETXID, 0)) { __set_errno (EINVAL); return -1; diff --git a/nptl/sysdeps/unix/sysv/linux/pthread_kill.c b/nptl/sysdeps/unix/sysv/linux/pthread_kill.c index 87577be..9115d6f 100644 --- a/nptl/sysdeps/unix/sysv/linux/pthread_kill.c +++ b/nptl/sysdeps/unix/sysv/linux/pthread_kill.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -37,8 +37,9 @@ __pthread_kill (threadid, signo) /* Not a valid thread handle. */ return ESRCH; - /* Disallow sending the signal we use for cancellation. */ - if (signo == SIGCANCEL || signo == SIGTIMER) + /* Disallow sending the signal we use for cancellation, timers, for + for the setxid implementation. */ + if (signo == SIGCANCEL || signo == SIGTIMER || signo == SIGSETXID) return EINVAL; /* We have a special syscall to do the work. */ |