Add __safe_fatal and use it in __pthread_unwind forwarder fallback.
This commit is contained in:
parent
9fe7e787ad
commit
f61a113fe0
|
@ -1,5 +1,11 @@
|
||||||
2014-07-31 Roland McGrath <roland@hack.frob.com>
|
2014-07-31 Roland McGrath <roland@hack.frob.com>
|
||||||
|
|
||||||
|
* sysdeps/generic/safe-fatal.h: New file.
|
||||||
|
* sysdeps/unix/sysv/linux/safe-fatal.h: New file.
|
||||||
|
* nptl/forward.c: Include it.
|
||||||
|
(__pthread_unwind): Use __safe_fatal as default action, rather
|
||||||
|
than a bogus use of INTERNAL_SYSCALL that could never work.
|
||||||
|
|
||||||
* config.h.in (HAVE_BUILTIN_TRAP): New #define to 0.
|
* config.h.in (HAVE_BUILTIN_TRAP): New #define to 0.
|
||||||
* configure.ac (libc_cv_builtin_trap): New test.
|
* configure.ac (libc_cv_builtin_trap): New test.
|
||||||
* configure: Regenerated.
|
* configure: Regenerated.
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
#include <shlib-compat.h>
|
#include <shlib-compat.h>
|
||||||
#include <atomic.h>
|
#include <atomic.h>
|
||||||
#include <sysdep.h>
|
#include <safe-fatal.h>
|
||||||
|
|
||||||
|
|
||||||
/* Pointers to the libc functions. */
|
/* Pointers to the libc functions. */
|
||||||
|
@ -202,11 +202,8 @@ FORWARD (pthread_setcancelstate, (int state, int *oldstate), (state, oldstate),
|
||||||
|
|
||||||
FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0)
|
FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0)
|
||||||
|
|
||||||
FORWARD_NORETURN(__pthread_unwind,
|
FORWARD_NORETURN (__pthread_unwind,
|
||||||
void attribute_hidden __attribute ((noreturn)) __cleanup_fct_attribute
|
void attribute_hidden __attribute ((noreturn))
|
||||||
attribute_compat_text_section,
|
__cleanup_fct_attribute attribute_compat_text_section,
|
||||||
(__pthread_unwind_buf_t *buf), (buf), {
|
(__pthread_unwind_buf_t *buf), (buf),
|
||||||
/* We cannot call abort() here. */
|
__safe_fatal ())
|
||||||
INTERNAL_SYSCALL_DECL (err);
|
|
||||||
INTERNAL_SYSCALL (kill, err, 1, SIGKILL);
|
|
||||||
})
|
|
||||||
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
/* Crash the process immediately, without possibility of deadlock. Generic.
|
||||||
|
Copyright (C) 2014 Free Software Foundation, Inc.
|
||||||
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation; either
|
||||||
|
version 2.1 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
The GNU C Library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with the GNU C Library; if not, see
|
||||||
|
<http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
#ifndef _SAFE_FATAL_H
|
||||||
|
#define _SAFE_FATAL_H 1
|
||||||
|
|
||||||
|
#include <abort-instr.h>
|
||||||
|
|
||||||
|
static inline void
|
||||||
|
__safe_fatal (void)
|
||||||
|
{
|
||||||
|
#ifdef ABORT_INSTRUCTION
|
||||||
|
/* This is not guaranteed to be free from the possibility of deadlock,
|
||||||
|
since it might generate a signal that can be caught. But it's better
|
||||||
|
than nothing. */
|
||||||
|
ABORT_INSTRUCTION;
|
||||||
|
#else
|
||||||
|
# error Need an OS-specific or machine-specific safe-fatal.h
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* safe-fatal.h */
|
|
@ -0,0 +1,33 @@
|
||||||
|
/* Crash the process immediately, without possibility of deadlock. Linux.
|
||||||
|
Copyright (C) 2014 Free Software Foundation, Inc.
|
||||||
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation; either
|
||||||
|
version 2.1 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
The GNU C Library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with the GNU C Library; if not, see
|
||||||
|
<http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
#ifndef _SAFE_FATAL_H
|
||||||
|
#define _SAFE_FATAL_H 1
|
||||||
|
|
||||||
|
#include <sysdep.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
static inline void
|
||||||
|
__safe_fatal (void)
|
||||||
|
{
|
||||||
|
INTERNAL_SYSCALL_DECL (err);
|
||||||
|
pid_t self = INTERNAL_SYSCALL (getpid, err, 0);
|
||||||
|
INTERNAL_SYSCALL (kill, err, 2, self, SIGKILL);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* safe-fatal.h */
|
Loading…
Reference in New Issue