diff options
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | test/ruby/test_vm_dump.rb | 21 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | vm_dump.c | 9 |
4 files changed, 40 insertions, 3 deletions
@@ -1,3 +1,14 @@ +Sun Mar 18 23:23:48 2018 Koichi Sasada <ko1@atdot.net> + + skip unless PLATFORM is darwin. + +Sun Mar 18 23:23:48 2018 NARUSE, Yui <naruse@ruby-lang.org> + + Treat NULL reference case [Bug #13566] + + Fix C level backtrace on Darwin + SEGV caused by invalid instruction call. + Sun Mar 18 23:11:29 2018 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (ARFLAGS): check if deterministic mode flag is diff --git a/test/ruby/test_vm_dump.rb b/test/ruby/test_vm_dump.rb new file mode 100644 index 0000000000..7144a0cbc6 --- /dev/null +++ b/test/ruby/test_vm_dump.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true +require 'test/unit' + +class TestVMDump < Test::Unit::TestCase + def assert_darwin_vm_dump_works(args) + skip if RUBY_PLATFORM !~ /darwin/ + assert_in_out_err(args, "", [], [:*, /^.* main \+ \d+$/, :*, /^\[IMPORTANT\]/, :*]) + end + + def test_darwin_invalid_call + assert_darwin_vm_dump_works(['-rfiddle', '-eFiddle::Function.new(Fiddle::Pointer.new(1), [], Fiddle::TYPE_VOID).call']) + end + + def test_darwin_segv_in_syscall + assert_darwin_vm_dump_works('-e1.times{Process.kill :SEGV,$$}') + end + + def test_darwin_invalid_access + assert_darwin_vm_dump_works(['-rfiddle', '-eFiddle.dlunwrap(100).class']) + end +end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.7" #define RUBY_RELEASE_DATE "2018-03-18" -#define RUBY_PATCHLEVEL 411 +#define RUBY_PATCHLEVEL 412 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 @@ -434,6 +434,7 @@ rb_vmdebug_thread_dump_state(VALUE self) # elif defined(__APPLE__) && defined(__x86_64__) && defined(HAVE_LIBUNWIND_H) # define UNW_LOCAL_ONLY # include <libunwind.h> +# include <sys/mman.h> # undef backtrace int backtrace(void **trace, int size) @@ -460,6 +461,8 @@ darwin_sigtramp: /* darwin's bundled libunwind doesn't support signal trampoline */ { ucontext_t *uctx; + char vec[1]; + int r; /* get _sigtramp's ucontext_t and set values to cursor * http://www.opensource.apple.com/source/Libc/Libc-825.25/i386/sys/_sigtramp.s * http://www.opensource.apple.com/source/libunwind/libunwind-35.1/src/unw_getcontext.s @@ -483,8 +486,10 @@ darwin_sigtramp: unw_set_reg(&cursor, UNW_X86_64_R14, uctx->uc_mcontext->__ss.__r14); unw_set_reg(&cursor, UNW_X86_64_R15, uctx->uc_mcontext->__ss.__r15); ip = uctx->uc_mcontext->__ss.__rip; - if (((char*)ip)[-2] == 0x0f && ((char*)ip)[-1] == 5) { - /* signal received in syscall */ + r = mincore((const void *)ip, 1, vec); + if (r || !vec[0] || memcmp((const char *)ip-2, "\x0f\x05", 2) == 0) { + /* if segv is caused by invalid call or signal received in syscall */ + /* the frame is invalid; skip */ trace[n++] = (void *)ip; ip = *(unw_word_t*)uctx->uc_mcontext->__ss.__rsp; } |