kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 59893,59922: [Backport #13895]

Browse source 
fix the case High Sierra's mincore(2) may return -128 [Bug #13895]

	Fix typos [ci skip]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@62640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2018-03-03 02:39:47 +00:00
parent 794ec1d2b1
commit dff0aeda1a
2 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.4" #define RUBY_VERSION "2.4.4"
#define RUBY_RELEASE_DATE "2018-03-03" #define RUBY_RELEASE_DATE "2018-03-03"
#define RUBY_PATCHLEVEL 244 #define RUBY_PATCHLEVEL 245
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3

31
vm_dump.c
View file

@ -455,7 +455,7 @@ darwin_sigtramp:
ucontext_t *uctx; ucontext_t *uctx;
char vec[1]; char vec[1];
int r; int r;
/* get _sigtramp's ucontext_t and set values to cursor /* get previous frame information from %rbx at _sigtramp 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/Libc/Libc-825.25/i386/sys/_sigtramp.s
* http://www.opensource.apple.com/source/libunwind/libunwind-35.1/src/unw_getcontext.s * http://www.opensource.apple.com/source/libunwind/libunwind-35.1/src/unw_getcontext.s
*/ */
@ -478,8 +478,35 @@ darwin_sigtramp:
unw_set_reg(&cursor, UNW_X86_64_R14, uctx->uc_mcontext->__ss.__r14); 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); unw_set_reg(&cursor, UNW_X86_64_R15, uctx->uc_mcontext->__ss.__r15);
ip = uctx->uc_mcontext->__ss.__rip; ip = uctx->uc_mcontext->__ss.__rip;
/* There're 4 cases for SEGV:
* (1) called invalid address
* (2) read or write invalid address
* (3) received signal
*
* Detail:
* (1) called invalid address
* In this case, saved ip is invalid address.
* It needs to just save the address for the information,
* skip the frame, and restore the frame calling the
* invalid address from %rsp.
* The problem is how to check whether the ip is valid or not.
* This code uses mincore(2) and assume the address's page is
* incore/referenced or not reflects the problem.
* Note that High Sierra's mincore(2) may return -128.
* (2) read or write invalid address
* saved ip is valid. just restart backtracing.
* (3) received signal in user space
* Same as (2).
* (4) received signal in kernel
* In this case saved ip points just after syscall, but registers are
* already overwritten by kernel. To fix register consistency,
* skip libc's kernel wrapper.
* To detect this case, just previous two bytes of ip is "\x0f\x05",
* syscall instruction of x86_64.
*/
r = mincore((const void *)ip, 1, vec); r = mincore((const void *)ip, 1, vec);
if (r || !vec[0] || memcmp((const char *)ip-2, "\x0f\x05", 2) == 0) { if (r || vec[0] <= 0 || memcmp((const char *)ip-2, "\x0f\x05", 2) == 0) {
/* if segv is caused by invalid call or signal received in syscall */ /* if segv is caused by invalid call or signal received in syscall */
/* the frame is invalid; skip */ /* the frame is invalid; skip */
trace[n++] = (void *)ip; trace[n++] = (void *)ip;