1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

signal.c: abort if nesting reserved signal

Browse Source 
* signal.c (check_reserved_signal): abort if reserved signal
  received in reserved signal handlers.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47977 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-10-16 08:15:46 +00:00
parent 5c3c2ddda2
commit 0d88cd9394
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
signal.c
View File

@ -799,10 +799,14 @@ check_stack_overflow(const void *addr)
#define MESSAGE_FAULT_ADDRESS #define MESSAGE_FAULT_ADDRESS
#endif #endif
#if defined SIGSEGV || defined SIGBUS || defined SIGILL || defined SIGFPE
static void check_reserved_signal(const char *name);
#ifdef SIGBUS #ifdef SIGBUS
static RETSIGTYPE static RETSIGTYPE
sigbus(int sig SIGINFO_ARG) sigbus(int sig SIGINFO_ARG)
{ {
check_reserved_signal("BUS");
/* /*
* Mac OS X makes KERN_PROTECTION_FAILURE when thread touch guard page. * Mac OS X makes KERN_PROTECTION_FAILURE when thread touch guard page.
* and it's delivered as SIGBUS instead of SIGSEGV to userland. It's crazy * and it's delivered as SIGBUS instead of SIGSEGV to userland. It's crazy
@ -815,7 +819,6 @@ sigbus(int sig SIGINFO_ARG)
} }
#endif #endif
#ifdef SIGSEGV
static void static void
ruby_abort(void) ruby_abort(void)
{ {
@ -830,25 +833,49 @@ ruby_abort(void)
} }
static int segv_received = 0;
extern int ruby_disable_gc; extern int ruby_disable_gc;
#ifdef SIGSEGV
static RETSIGTYPE static RETSIGTYPE
sigsegv(int sig SIGINFO_ARG) sigsegv(int sig SIGINFO_ARG)
{ {
if (segv_received) { check_reserved_signal("SEGV");
ssize_t RB_UNUSED_VAR(err); CHECK_STACK_OVERFLOW();
static const char msg[] = "SEGV received in SEGV handler\n"; rb_bug_context(SIGINFO_CTX, "Segmentation fault" MESSAGE_FAULT_ADDRESS);
}
#endif
err = write(2, msg, sizeof(msg)); #ifdef SIGILL
static RETSIGTYPE
sigill(int sig SIGINFO_ARG)
{
check_reserved_signal("ILL");
#if defined __APPLE__
CHECK_STACK_OVERFLOW();
#endif
rb_bug_context(SIGINFO_CTX, "Illegal instruction" MESSAGE_FAULT_ADDRESS);
}
#endif
static void
check_reserved_signal(const char *name)
{
static const char *received;
const char *prev = ATOMIC_PTR_EXCHANGE(received, name);
if (prev) {
ssize_t RB_UNUSED_VAR(err);
static const char msg1[] = " received in ";
static const char msg2[] = " handler\n";
err = write(2, name, strlen(name));
err = write(2, msg1, sizeof(msg1));
err = write(2, prev, strlen(prev));
err = write(2, msg2, sizeof(msg2));
ruby_abort(); ruby_abort();
} }
CHECK_STACK_OVERFLOW();
segv_received = 1;
ruby_disable_gc = 1; ruby_disable_gc = 1;
rb_bug_context(SIGINFO_CTX, "Segmentation fault" MESSAGE_FAULT_ADDRESS);
} }
#endif #endif
@ -1381,6 +1408,9 @@ Init_signal(void)
#ifdef SIGBUS #ifdef SIGBUS
install_sighandler(SIGBUS, (sighandler_t)sigbus); install_sighandler(SIGBUS, (sighandler_t)sigbus);
#endif #endif
#ifdef SIGILL
install_sighandler(SIGILL, (sighandler_t)sigill);
#endif
#ifdef SIGSEGV #ifdef SIGSEGV
# ifdef USE_SIGALTSTACK # ifdef USE_SIGALTSTACK
rb_register_sigaltstack(GET_THREAD()); rb_register_sigaltstack(GET_THREAD());