[asan] Add __libc_siglongjmp/__libc_longjmp interceptors

Change-Id: Ic247cb33f17743fa597b3a74baf7cf31c075165d

diff --git a/libsanitizer/asan/asan_interceptors.cc b/libsanitizer/asan/asan_interceptors.cc
index 1678372..2e99a7f 100644 (file)
--- a/libsanitizer/asan/asan_interceptors.cc
+++ b/libsanitizer/asan/asan_interceptors.cc
@@ -386,6 +386,20 @@ INTERCEPTOR(void, siglongjmp, void *env, int val) {
 }
 #endif
 
+#if ASAN_INTERCEPT__LIBC_SIGLONGJMP
+INTERCEPTOR(void, __libc_siglongjmp, void *env, int val) {
+  __asan_handle_no_return();
+  REAL(__libc_siglongjmp)(env, val);
+}
+#endif
+
+#if ASAN_INTERCEPT__LIBC_LONGJMP
+INTERCEPTOR(void, __libc_longjmp, void *env, int val) {
+  __asan_handle_no_return();
+  REAL(__libc_longjmp)(env, val);
+}
+#endif
+
 #if ASAN_INTERCEPT___CXA_THROW
 INTERCEPTOR(void, __cxa_throw, void *a, void *b, void *c) {
   CHECK(REAL(__cxa_throw));
@@ -870,6 +884,12 @@ void InitializeAsanInterceptors() {
 #if ASAN_INTERCEPT_SIGLONGJMP
   ASAN_INTERCEPT_FUNC(siglongjmp);
 #endif
+#if ASAN_INTERCEPT__LIBC_SIGLONGJMP
+  ASAN_INTERCEPT_FUNC(__libc_siglongjmp);
+#endif
+#if ASAN_INTERCEPT__LIBC_LONGJMP
+  ASAN_INTERCEPT_FUNC(__libc_longjmp);
+#endif
 
   // Intercept exception handling functions.
 #if ASAN_INTERCEPT___CXA_THROW

diff --git a/libsanitizer/asan/asan_interceptors.h b/libsanitizer/asan/asan_interceptors.h
index 706729c..1d9f30b 100644 (file)
--- a/libsanitizer/asan/asan_interceptors.h
+++ b/libsanitizer/asan/asan_interceptors.h
@@ -40,8 +40,12 @@
 
 #if SANITIZER_LINUX && !SANITIZER_ANDROID
 # define ASAN_INTERCEPT_SWAPCONTEXT 1
+# define ASAN_INTERCEPT__LIBC_SIGLONGJMP 1
+# define ASAN_INTERCEPT__LIBC_LONGJMP 1
 #else
 # define ASAN_INTERCEPT_SWAPCONTEXT 0
+# define ASAN_INTERCEPT__LIBC_SIGLONGJMP 0
+# define ASAN_INTERCEPT__LIBC_LONGJMP 0
 #endif
 
 #if !SANITIZER_WINDOWS