about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/pt-raise.c
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-04-22 09:25:20 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.com>2016-07-13 17:08:51 +0100
commit2ac88eecc57ff00e0b5ff803ebcc3465d2d640dd (patch)
tree5b425337c8ccc0f0cb878df1f599fa3a2974f01d /sysdeps/unix/sysv/linux/pt-raise.c
parente15eaa8f335ebfd565ab7752c64f3415d427d9b2 (diff)
downloadglibc-2ac88eecc57ff00e0b5ff803ebcc3465d2d640dd.tar.gz
glibc-2ac88eecc57ff00e0b5ff803ebcc3465d2d640dd.tar.xz
glibc-2ac88eecc57ff00e0b5ff803ebcc3465d2d640dd.zip
Refactor Linux raise implementation (BZ#15368)
This patch changes both the nptl and libc Linux raise implementation
to avoid the issues described in BZ#15368.  The strategy used is
summarized in bug report first comment:

 1. Block all signals (including internal NPTL ones);
 2. Get pid and tid directly from syscall (not relying on cached
    values);
 3. Call tgkill;
 4. Restore old signal mask.

Tested on x86_64 and i686.

	[BZ #15368]
	* sysdeps/unix/sysv/linux/nptl-signals.h
	(__nptl_clear_internal_signals): New function.
	(__libc_signal_block_all): Likewise.
	(__libc_signal_block_app): Likewise.
	(__libc_signal_restore_set): Likewise.
	* sysdeps/unix/sysv/linux/pt-raise.c (raise): Use Linux raise.c
	implementation.
	* sysdeps/unix/sysv/linux/raise.c (raise): Reimplement to not use
	the cached pid/tid value in pthread structure.
Diffstat (limited to 'sysdeps/unix/sysv/linux/pt-raise.c')
-rw-r--r--sysdeps/unix/sysv/linux/pt-raise.c23
1 files changed, 3 insertions, 20 deletions
diff --git a/sysdeps/unix/sysv/linux/pt-raise.c b/sysdeps/unix/sysv/linux/pt-raise.c
index 715bbe9f2e..5f6dea1716 100644
--- a/sysdeps/unix/sysv/linux/pt-raise.c
+++ b/sysdeps/unix/sysv/linux/pt-raise.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002-2016 Free Software Foundation, Inc.
+/* ISO C raise function for libpthread.
+   Copyright (C) 2002-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -16,22 +17,4 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <errno.h>
-#include <signal.h>
-#include <sysdep.h>
-#include <tls.h>
-
-
-int
-raise (int sig)
-{
-  /* raise is an async-safe function.  It could be called while the
-     fork function temporarily invalidated the PID field.  Adjust for
-     that.  */
-  pid_t pid = THREAD_GETMEM (THREAD_SELF, pid);
-  if (__glibc_unlikely (pid < 0))
-    pid = -pid;
-
-  return INLINE_SYSCALL (tgkill, 3, pid, THREAD_GETMEM (THREAD_SELF, tid),
-			 sig);
-}
+#include <sysdeps/unix/sysv/linux/raise.c>