diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2015-09-02 21:32:46 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2015-09-02 21:32:46 +0000 |
| commit | 1697afff0772628d5eef6d47a7cc4f9aee7c4331 (patch) | |
| tree | 09abab43ce03bea0b60051876b5229560d31e1ec /lib/asan/asan_interceptors.cc | |
| parent | 38a6d1d485a808792d73967ef1ed9ec910d987a7 (diff) | |
[asan] Fix signal interception on Android.
All supported version of Android provide both "signal" and
"bsd_signal" libc exports. Binaries built for API level <21 call
bsd_signal; newer binaries call signal.
Simply intercept both.
Fixes AddressSanitizer.SignalTest on Android/x86.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@246716 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan/asan_interceptors.cc')
| -rw-r--r-- | lib/asan/asan_interceptors.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/asan/asan_interceptors.cc b/lib/asan/asan_interceptors.cc index f842c80f7..0ed175ac3 100644 --- a/lib/asan/asan_interceptors.cc +++ b/lib/asan/asan_interceptors.cc @@ -263,21 +263,21 @@ DEFINE_REAL_PTHREAD_FUNCTIONS #if ASAN_INTERCEPT_SIGNAL_AND_SIGACTION -#if SANITIZER_ANDROID && !defined(_LP64) +#if SANITIZER_ANDROID INTERCEPTOR(void*, bsd_signal, int signum, void *handler) { if (!IsDeadlySignal(signum) || common_flags()->allow_user_segv_handler) { return REAL(bsd_signal)(signum, handler); } return 0; } -#else +#endif + INTERCEPTOR(void*, signal, int signum, void *handler) { if (!IsDeadlySignal(signum) || common_flags()->allow_user_segv_handler) { return REAL(signal)(signum, handler); } return 0; } -#endif INTERCEPTOR(int, sigaction, int signum, const struct sigaction *act, struct sigaction *oldact) { @@ -769,11 +769,10 @@ void InitializeAsanInterceptors() { ASAN_INTERCEPT_FUNC(longjmp); #if ASAN_INTERCEPT_SIGNAL_AND_SIGACTION ASAN_INTERCEPT_FUNC(sigaction); -#if SANITIZER_ANDROID && !defined(_LP64) +#if SANITIZER_ANDROID ASAN_INTERCEPT_FUNC(bsd_signal); -#else - ASAN_INTERCEPT_FUNC(signal); #endif + ASAN_INTERCEPT_FUNC(signal); #endif #if ASAN_INTERCEPT_SWAPCONTEXT ASAN_INTERCEPT_FUNC(swapcontext); |