From 78d77c2638b8e02020737c9b296ce2198e4c58e6 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Tue, 29 Oct 2013 22:25:27 +0000 Subject: [sanitizer] Intercept drand48_r, lrand48_r. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@193655 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/msan/tests/msan_test.cc | 16 ++++++++++++++++ .../sanitizer_common_interceptors.inc | 22 ++++++++++++++++++++++ .../sanitizer_platform_interceptors.h | 1 + lib/tsan/rtl/tsan_stat.cc | 2 ++ lib/tsan/rtl/tsan_stat.h | 2 ++ 5 files changed, 43 insertions(+) diff --git a/lib/msan/tests/msan_test.cc b/lib/msan/tests/msan_test.cc index 613367f8..2269bb23 100644 --- a/lib/msan/tests/msan_test.cc +++ b/lib/msan/tests/msan_test.cc @@ -1587,6 +1587,22 @@ TEST(MemorySanitizer, lgammal_r) { EXPECT_NOT_POISONED(sgn); } +TEST(MemorySanitizer, drand48_r) { + struct drand48_data buf; + srand48_r(0, &buf); + double d; + drand48_r(&buf, &d); + EXPECT_NOT_POISONED(d); +} + +TEST(MemorySanitizer, lrand48_r) { + struct drand48_data buf; + srand48_r(0, &buf); + long d; + lrand48_r(&buf, &d); + EXPECT_NOT_POISONED(d); +} + TEST(MemorySanitizer, sprintf) { // NOLINT char buff[10]; break_optimization(buff); diff --git a/lib/sanitizer_common/sanitizer_common_interceptors.inc b/lib/sanitizer_common/sanitizer_common_interceptors.inc index 1968e4c3..7c8669a2 100644 --- a/lib/sanitizer_common/sanitizer_common_interceptors.inc +++ b/lib/sanitizer_common/sanitizer_common_interceptors.inc @@ -2789,6 +2789,27 @@ INTERCEPTOR(long double, lgammal_r, long double x, int *signp) { #define INIT_LGAMMA_R #endif +#if SANITIZER_INTERCEPT_DRAND48_R +INTERCEPTOR(int, drand48_r, void *buffer, double *result) { + void *ctx; + COMMON_INTERCEPTOR_ENTER(ctx, drand48_r, buffer, result); + int res = REAL(drand48_r)(buffer, result); + if (result) COMMON_INTERCEPTOR_WRITE_RANGE(ctx, result, sizeof(*result)); + return res; +} +INTERCEPTOR(int, lrand48_r, void *buffer, long *result) { + void *ctx; + COMMON_INTERCEPTOR_ENTER(ctx, lrand48_r, buffer, result); + int res = REAL(lrand48_r)(buffer, result); + if (result) COMMON_INTERCEPTOR_WRITE_RANGE(ctx, result, sizeof(*result)); + return res; +} +#define INIT_DRAND48_R \ + INTERCEPT_FUNCTION(drand48_r); \ + INTERCEPT_FUNCTION(lrand48_r); +#else +#define INIT_DRAND48_R +#endif #define SANITIZER_COMMON_INTERCEPTORS_INIT \ INIT_STRCMP; \ @@ -2896,4 +2917,5 @@ INTERCEPTOR(long double, lgammal_r, long double x, int *signp) { INIT_REMQUO; \ INIT_LGAMMA; \ INIT_LGAMMA_R; \ + INIT_DRAND48_R; \ /**/ diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h index 92219f7b..d73107a9 100644 --- a/lib/sanitizer_common/sanitizer_platform_interceptors.h +++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h @@ -148,6 +148,7 @@ # define SANITIZER_INTERCEPT_REMQUO SI_NOT_WINDOWS # define SANITIZER_INTERCEPT_LGAMMA SI_NOT_WINDOWS # define SANITIZER_INTERCEPT_LGAMMA_R SI_LINUX +# define SANITIZER_INTERCEPT_DRAND48_R SI_LINUX_NOT_ANDROID # define SANITIZER_INTERCEPT__EXIT SI_LINUX diff --git a/lib/tsan/rtl/tsan_stat.cc b/lib/tsan/rtl/tsan_stat.cc index 0d0607be..6082120f 100644 --- a/lib/tsan/rtl/tsan_stat.cc +++ b/lib/tsan/rtl/tsan_stat.cc @@ -410,6 +410,8 @@ void StatOutput(u64 *stat) { name[StatInt_lgamma_r] = " lgamma_r "; name[StatInt_lgammaf_r] = " lgammaf_r "; name[StatInt_lgammal_r] = " lgammal_r "; + name[StatInt_drand48_r] = " drand48_r "; + name[StatInt_lrand48_r] = " lrand48_r "; name[StatInt_pthread_attr_getdetachstate] = " pthread_addr_getdetachstate "; // NOLINT name[StatInt_pthread_attr_getguardsize] = " pthread_addr_getguardsize "; // NOLINT diff --git a/lib/tsan/rtl/tsan_stat.h b/lib/tsan/rtl/tsan_stat.h index 6c1927e8..4d0ec3fc 100644 --- a/lib/tsan/rtl/tsan_stat.h +++ b/lib/tsan/rtl/tsan_stat.h @@ -405,6 +405,8 @@ enum StatType { StatInt_lgamma_r, StatInt_lgammaf_r, StatInt_lgammal_r, + StatInt_drand48_r, + StatInt_lrand48_r, StatInt_pthread_attr_getdetachstate, StatInt_pthread_attr_getguardsize, -- cgit v1.2.3