diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2019-02-28 19:21:25 +0000 |
|---|---|---|
| committer | Yi Kong <yikong@google.com> | 2019-03-05 01:20:51 +0000 |
| commit | 966c41b85fbb9ebbaf2d3fc2053e4a35c3f1c578 (patch) | |
| tree | b36a9fdc7a3baf84277a979f105ed19531ca8c6b | |
| parent | 68a0d08de5bea4b98eb4b4330aeee1fabc3dd1d5 (diff) | |
| download | compiler-rt-966c41b85fbb9ebbaf2d3fc2053e4a35c3f1c578.tar.gz | |
[sanitizer] Fix vfork interceptor on i386 w/ dynamic runtime.
PLT calls on i386 expect GOT base address in %ebx.
This call does not need to go through PLT strictly speaking, but I'd
rather avoid future surprises and implement the most general case.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@355125 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/sanitizer_common/sanitizer_common_interceptors_vfork_i386.inc.S | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_vfork_i386.inc.S b/lib/sanitizer_common/sanitizer_common_interceptors_vfork_i386.inc.S index d693aa3e0..ed693819c 100644 --- a/lib/sanitizer_common/sanitizer_common_interceptors_vfork_i386.inc.S +++ b/lib/sanitizer_common/sanitizer_common_interceptors_vfork_i386.inc.S @@ -20,15 +20,28 @@ ASM_WRAPPER_NAME(vfork): add $_GLOBAL_OFFSET_TABLE_+(.Ltmp0-.L0$pb), %eax call *_ZN14__interception10real_vforkE@GOTOFF(%eax) - // Restore return address from the spill area. + // Restore the stack frame. + // 12(%esp) return address + // 8(%esp) spill %ebx + // 4(%esp) spill REAL(vfork) return value + // (%esp) call frame (arg0) for __*_handle_vfork sub $16, %esp + mov %ebx, 8(%esp) mov %eax, 4(%esp) + + // Form GOT address in %ebx. + call .L1$pb +.L1$pb: + pop %ebx +.Ltmp1: + add $_GLOBAL_OFFSET_TABLE_+(.Ltmp1-.L1$pb), %ebx + + // Restore original return address. call COMMON_INTERCEPTOR_SPILL_AREA mov (%eax), %ecx mov %ecx, 12(%esp) mov 4(%esp), %eax - // Call handle_vfork in the parent process (%rax != 0). test %eax, %eax je .L_exit @@ -39,6 +52,7 @@ ASM_WRAPPER_NAME(vfork): .L_exit: mov 4(%esp), %eax + mov 8(%esp), %ebx add $12, %esp ret ASM_SIZE(vfork) |