OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[asan] Fix signal() interception on 64-bit Android. 

The bsd_signal() special case only applies to 32-bit Android targets.
Fixes AddressSanitizer.SignalTest on aarch64/android.

llvm-svn: 243714
This commit is contained in:
Evgeniy Stepanov 2015-07-31 00:00:03 +00:00
parent 7b276e2fb4
commit f3ed62f626
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler-rt/lib/asan/asan_interceptors.cc
View File

@ -263,7 +263,7 @@ DEFINE_REAL_PTHREAD_FUNCTIONS
#if ASAN_INTERCEPT_SIGNAL_AND_SIGACTION #if ASAN_INTERCEPT_SIGNAL_AND_SIGACTION
#if SANITIZER_ANDROID #if SANITIZER_ANDROID && !defined(_LP64)
INTERCEPTOR(void*, bsd_signal, int signum, void *handler) { INTERCEPTOR(void*, bsd_signal, int signum, void *handler) {
if (!IsDeadlySignal(signum) || common_flags()->allow_user_segv_handler) { if (!IsDeadlySignal(signum) || common_flags()->allow_user_segv_handler) {
return REAL(bsd_signal)(signum, handler); return REAL(bsd_signal)(signum, handler);
@ -769,7 +769,7 @@ void InitializeAsanInterceptors() {
ASAN_INTERCEPT_FUNC(longjmp); ASAN_INTERCEPT_FUNC(longjmp);
#if ASAN_INTERCEPT_SIGNAL_AND_SIGACTION #if ASAN_INTERCEPT_SIGNAL_AND_SIGACTION
ASAN_INTERCEPT_FUNC(sigaction); ASAN_INTERCEPT_FUNC(sigaction);
#if SANITIZER_ANDROID #if SANITIZER_ANDROID && !defined(_LP64)
ASAN_INTERCEPT_FUNC(bsd_signal); ASAN_INTERCEPT_FUNC(bsd_signal);
#else #else
ASAN_INTERCEPT_FUNC(signal); ASAN_INTERCEPT_FUNC(signal);