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

Reset signal handler before aborting due to sanitizer

Browse Source 
When aborting by a sanitizer, `SIGILL` or something is raised and
often results in raising the same signal infinitely.
This commit is contained in:
Nobuyoshi Nakada 2023-07-18 00:07:58 +09:00
parent ebeecbd575
commit d1992d6df2
Notes: git 2023-07-18 15:07:13 +00:00 
Merged: https://github.com/ruby/ruby/pull/8090
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
signal.c
View File

@ -880,10 +880,10 @@ check_stack_overflow(int sig, const void *addr)
#endif #endif
#if defined SIGSEGV || defined SIGBUS || defined SIGILL || defined SIGFPE #if defined SIGSEGV || defined SIGBUS || defined SIGILL || defined SIGFPE
NOINLINE(static void check_reserved_signal_(const char *name, size_t name_len)); NOINLINE(static void check_reserved_signal_(const char *name, size_t name_len, int signo));
/* noinine to reduce stack usage in signal handers */ /* noinine to reduce stack usage in signal handers */
#define check_reserved_signal(name) check_reserved_signal_(name, sizeof(name)-1) #define check_reserved_signal(name) check_reserved_signal_(name, sizeof(name)-1, sig)
#ifdef SIGBUS #ifdef SIGBUS
@ -955,7 +955,7 @@ ruby_abort(void)
} }
static void static void
check_reserved_signal_(const char *name, size_t name_len) check_reserved_signal_(const char *name, size_t name_len, int signo)
{ {
const char *prev = ATOMIC_PTR_EXCHANGE(received_signal, name); const char *prev = ATOMIC_PTR_EXCHANGE(received_signal, name);
@ -975,6 +975,11 @@ check_reserved_signal_(const char *name, size_t name_len)
# define W(str, len) err = write(stderr_fd, (str), (len)) # define W(str, len) err = write(stderr_fd, (str), (len))
#endif #endif
#if __has_feature(address_sanitizer) || \
__has_feature(memory_sanitizer) || \
defined(HAVE_VALGRIND_MEMCHECK_H)
ruby_posix_signal(signo, SIG_DFL);
#endif
W(name, name_len); W(name, name_len);
W(msg1, sizeof(msg1)); W(msg1, sizeof(msg1));
W(prev, strlen(prev)); W(prev, strlen(prev));