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

AddressSanitizer: Enforce default visibility for all libc interceptors 

llvm-svn: 149247
This commit is contained in:
Alexey Samsonov 2012-01-30 13:42:44 +00:00
parent 81ebb0aafb
commit 2dcef2d2a8
3 changed files with 53 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,7 @@
// in __asan::real_f(). // in __asan::real_f().
#if defined(__APPLE__) #if defined(__APPLE__)
// Include the declarations of the original functions. // Include the declarations of the original functions.
#include <signal.h>
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>
@ -302,9 +303,7 @@ static void *asan_thread_start(void *arg) {
#ifndef _WIN32 #ifndef _WIN32
extern "C" extern "C"
#ifndef __APPLE__ INTERCEPTOR_ATTRIBUTE
__attribute__((visibility("default")))
#endif
int WRAP(pthread_create)(pthread_t *thread, const pthread_attr_t *attr, int WRAP(pthread_create)(pthread_t *thread, const pthread_attr_t *attr,
void *(*start_routine) (void *), void *arg) { void *(*start_routine) (void *), void *arg) {
GET_STACK_TRACE_HERE(kStackTraceMax); GET_STACK_TRACE_HERE(kStackTraceMax);
@ -315,6 +314,7 @@ int WRAP(pthread_create)(pthread_t *thread, const pthread_attr_t *attr,
} }
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
void *WRAP(signal)(int signum, void *handler) { void *WRAP(signal)(int signum, void *handler) {
if (!AsanInterceptsSignal(signum)) { if (!AsanInterceptsSignal(signum)) {
return real_signal(signum, handler); return real_signal(signum, handler);
@ -323,10 +323,9 @@ void *WRAP(signal)(int signum, void *handler) {
} }
extern "C" extern "C"
int (sigaction)(int signum, const void *act, void *oldact); INTERCEPTOR_ATTRIBUTE
int WRAP(sigaction)(int signum, const struct sigaction *act,
extern "C" struct sigaction *oldact) {
int WRAP(sigaction)(int signum, const void *act, void *oldact) {
if (!AsanInterceptsSignal(signum)) { if (!AsanInterceptsSignal(signum)) {
return real_sigaction(signum, act, oldact); return real_sigaction(signum, act, oldact);
} }
@ -344,25 +343,35 @@ static void UnpoisonStackFromHereToTop() {
PoisonShadow(bottom, top - bottom, 0); PoisonShadow(bottom, top - bottom, 0);
} }
extern "C" void WRAP(longjmp)(void *env, int val) { extern "C"
INTERCEPTOR_ATTRIBUTE
void WRAP(longjmp)(void *env, int val) {
UnpoisonStackFromHereToTop(); UnpoisonStackFromHereToTop();
real_longjmp(env, val); real_longjmp(env, val);
} }
extern "C" void WRAP(_longjmp)(void *env, int val) { extern "C"
INTERCEPTOR_ATTRIBUTE
void WRAP(_longjmp)(void *env, int val) {
UnpoisonStackFromHereToTop(); UnpoisonStackFromHereToTop();
real__longjmp(env, val); real__longjmp(env, val);
} }
extern "C" void WRAP(siglongjmp)(void *env, int val) { extern "C"
INTERCEPTOR_ATTRIBUTE
void WRAP(siglongjmp)(void *env, int val) {
UnpoisonStackFromHereToTop(); UnpoisonStackFromHereToTop();
real_siglongjmp(env, val); real_siglongjmp(env, val);
} }
extern "C" void __cxa_throw(void *a, void *b, void *c);
#if ASAN_HAS_EXCEPTIONS == 1 #if ASAN_HAS_EXCEPTIONS == 1
extern "C" void WRAP(__cxa_throw)(void *a, void *b, void *c) { #ifdef __APPLE__
extern "C" void __cxa_throw(void *a, void *b, void *c);
#endif // __APPLE__
extern "C"
INTERCEPTOR_ATTRIBUTE
void WRAP(__cxa_throw)(void *a, void *b, void *c) {
CHECK(&real___cxa_throw); CHECK(&real___cxa_throw);
UnpoisonStackFromHereToTop(); UnpoisonStackFromHereToTop();
real___cxa_throw(a, b, c); real___cxa_throw(a, b, c);
@ -379,18 +388,26 @@ static void MlockIsUnsupported() {
printed = true; printed = true;
Printf("INFO: AddressSanitizer ignores mlock/mlockall/munlock/munlockall\n"); Printf("INFO: AddressSanitizer ignores mlock/mlockall/munlock/munlockall\n");
} }
INTERCEPTOR_ATTRIBUTE
int mlock(const void *addr, size_t len) { int mlock(const void *addr, size_t len) {
MlockIsUnsupported(); MlockIsUnsupported();
return 0; return 0;
} }
INTERCEPTOR_ATTRIBUTE
int munlock(const void *addr, size_t len) { int munlock(const void *addr, size_t len) {
MlockIsUnsupported(); MlockIsUnsupported();
return 0; return 0;
} }
INTERCEPTOR_ATTRIBUTE
int mlockall(int flags) { int mlockall(int flags) {
MlockIsUnsupported(); MlockIsUnsupported();
return 0; return 0;
} }
INTERCEPTOR_ATTRIBUTE
int munlockall(void) { int munlockall(void) {
MlockIsUnsupported(); MlockIsUnsupported();
return 0; return 0;
@ -410,6 +427,7 @@ static inline int CharCaseCmp(unsigned char c1, unsigned char c2) {
} }
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
int WRAP(memcmp)(const void *a1, const void *a2, size_t size) { int WRAP(memcmp)(const void *a1, const void *a2, size_t size) {
ENSURE_ASAN_INITED(); ENSURE_ASAN_INITED();
unsigned char c1 = 0, c2 = 0; unsigned char c1 = 0, c2 = 0;
@ -427,6 +445,7 @@ int WRAP(memcmp)(const void *a1, const void *a2, size_t size) {
} }
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
void *WRAP(memcpy)(void *to, const void *from, size_t size) { void *WRAP(memcpy)(void *to, const void *from, size_t size) {
// memcpy is called during __asan_init() from the internals // memcpy is called during __asan_init() from the internals
// of printf(...). // of printf(...).
@ -447,6 +466,7 @@ void *WRAP(memcpy)(void *to, const void *from, size_t size) {
} }
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
void *WRAP(memmove)(void *to, const void *from, size_t size) { void *WRAP(memmove)(void *to, const void *from, size_t size) {
ENSURE_ASAN_INITED(); ENSURE_ASAN_INITED();
if (FLAG_replace_intrin) { if (FLAG_replace_intrin) {
@ -457,6 +477,7 @@ void *WRAP(memmove)(void *to, const void *from, size_t size) {
} }
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
void *WRAP(memset)(void *block, int c, size_t size) { void *WRAP(memset)(void *block, int c, size_t size) {
// memset is called inside INTERCEPT_FUNCTION on Mac. // memset is called inside INTERCEPT_FUNCTION on Mac.
if (asan_init_is_running) { if (asan_init_is_running) {
@ -471,11 +492,13 @@ void *WRAP(memset)(void *block, int c, size_t size) {
#ifndef __APPLE__ #ifndef __APPLE__
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
char *WRAP(index)(const char *str, int c) char *WRAP(index)(const char *str, int c)
__attribute__((alias(WRAPPER_NAME(strchr)))); __attribute__((alias(WRAPPER_NAME(strchr))));
#endif #endif
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
char *WRAP(strchr)(const char *str, int c) { char *WRAP(strchr)(const char *str, int c) {
ENSURE_ASAN_INITED(); ENSURE_ASAN_INITED();
char *result = real_strchr(str, c); char *result = real_strchr(str, c);
@ -487,6 +510,7 @@ char *WRAP(strchr)(const char *str, int c) {
} }
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
int WRAP(strcasecmp)(const char *s1, const char *s2) { int WRAP(strcasecmp)(const char *s1, const char *s2) {
ENSURE_ASAN_INITED(); ENSURE_ASAN_INITED();
unsigned char c1, c2; unsigned char c1, c2;
@ -502,6 +526,7 @@ int WRAP(strcasecmp)(const char *s1, const char *s2) {
} }
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
char *WRAP(strcat)(char *to, const char *from) { // NOLINT char *WRAP(strcat)(char *to, const char *from) { // NOLINT
ENSURE_ASAN_INITED(); ENSURE_ASAN_INITED();
if (FLAG_replace_str) { if (FLAG_replace_str) {
@ -518,6 +543,7 @@ char *WRAP(strcat)(char *to, const char *from) { // NOLINT
} }
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
int WRAP(strcmp)(const char *s1, const char *s2) { int WRAP(strcmp)(const char *s1, const char *s2) {
if (!asan_inited) { if (!asan_inited) {
return internal_strcmp(s1, s2); return internal_strcmp(s1, s2);
@ -535,6 +561,7 @@ int WRAP(strcmp)(const char *s1, const char *s2) {
} }
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
char *WRAP(strcpy)(char *to, const char *from) { // NOLINT char *WRAP(strcpy)(char *to, const char *from) { // NOLINT
// strcpy is called from malloc_default_purgeable_zone() // strcpy is called from malloc_default_purgeable_zone()
// in __asan::ReplaceSystemAlloc() on Mac. // in __asan::ReplaceSystemAlloc() on Mac.
@ -552,6 +579,7 @@ char *WRAP(strcpy)(char *to, const char *from) { // NOLINT
} }
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
char *WRAP(strdup)(const char *s) { char *WRAP(strdup)(const char *s) {
ENSURE_ASAN_INITED(); ENSURE_ASAN_INITED();
if (FLAG_replace_str) { if (FLAG_replace_str) {
@ -562,6 +590,7 @@ char *WRAP(strdup)(const char *s) {
} }
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
size_t WRAP(strlen)(const char *s) { size_t WRAP(strlen)(const char *s) {
// strlen is called from malloc_default_purgeable_zone() // strlen is called from malloc_default_purgeable_zone()
// in __asan::ReplaceSystemAlloc() on Mac. // in __asan::ReplaceSystemAlloc() on Mac.
@ -577,6 +606,7 @@ size_t WRAP(strlen)(const char *s) {
} }
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
int WRAP(strncasecmp)(const char *s1, const char *s2, size_t size) { int WRAP(strncasecmp)(const char *s1, const char *s2, size_t size) {
ENSURE_ASAN_INITED(); ENSURE_ASAN_INITED();
unsigned char c1 = 0, c2 = 0; unsigned char c1 = 0, c2 = 0;
@ -592,6 +622,7 @@ int WRAP(strncasecmp)(const char *s1, const char *s2, size_t size) {
} }
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
int WRAP(strncmp)(const char *s1, const char *s2, size_t size) { int WRAP(strncmp)(const char *s1, const char *s2, size_t size) {
// strncmp is called from malloc_default_purgeable_zone() // strncmp is called from malloc_default_purgeable_zone()
// in __asan::ReplaceSystemAlloc() on Mac. // in __asan::ReplaceSystemAlloc() on Mac.
@ -611,6 +642,7 @@ int WRAP(strncmp)(const char *s1, const char *s2, size_t size) {
} }
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
char *WRAP(strncpy)(char *to, const char *from, size_t size) { char *WRAP(strncpy)(char *to, const char *from, size_t size) {
ENSURE_ASAN_INITED(); ENSURE_ASAN_INITED();
if (FLAG_replace_str) { if (FLAG_replace_str) {
@ -624,6 +656,7 @@ char *WRAP(strncpy)(char *to, const char *from, size_t size) {
#ifndef __APPLE__ #ifndef __APPLE__
extern "C" extern "C"
INTERCEPTOR_ATTRIBUTE
size_t WRAP(strnlen)(const char *s, size_t maxlen) { size_t WRAP(strnlen)(const char *s, size_t maxlen) {
ENSURE_ASAN_INITED(); ENSURE_ASAN_INITED();
size_t length = real_strnlen(s, maxlen); size_t length = real_strnlen(s, maxlen);

8
compiler-rt/lib/asan/asan_interceptors.h
View File

@ -18,13 +18,18 @@
#if defined(__APPLE__) #if defined(__APPLE__)
# define WRAP(x) wrap_##x # define WRAP(x) wrap_##x
# define INTERCEPTOR_ATTRIBUTE
#elif defined(_WIN32) #elif defined(_WIN32)
// TODO(timurrrr): we're likely to use something else later on Windows. // TODO(timurrrr): we're likely to use something else later on Windows.
# define WRAP(x) wrap_##x # define WRAP(x) wrap_##x
# define INTERCEPTOR_ATTRIBUTE
#else #else
# define WRAP(x) x # define WRAP(x) x
# define INTERCEPTOR_ATTRIBUTE __attribute__((visibility("default")))
#endif #endif
struct sigaction;
namespace __asan { namespace __asan {
typedef void* (*index_f)(const char *string, int c); typedef void* (*index_f)(const char *string, int c);
@ -44,7 +49,8 @@ typedef int (*strncmp_f)(const char *s1, const char *s2, size_t size);
typedef char* (*strncpy_f)(char *to, const char *from, size_t size); typedef char* (*strncpy_f)(char *to, const char *from, size_t size);
typedef size_t (*strnlen_f)(const char *s, size_t maxlen); typedef size_t (*strnlen_f)(const char *s, size_t maxlen);
typedef void *(*signal_f)(int signum, void *handler); typedef void *(*signal_f)(int signum, void *handler);
typedef int (*sigaction_f)(int signum, const void *act, void *oldact); typedef int (*sigaction_f)(int signum, const struct sigaction *act,
struct sigaction *oldact);
// __asan::real_X() holds pointer to library implementation of X(). // __asan::real_X() holds pointer to library implementation of X().
extern index_f real_index; extern index_f real_index;

2
compiler-rt/lib/asan/asan_malloc_linux.cc
View File

@ -22,8 +22,6 @@
#include <malloc.h> #include <malloc.h>
#define INTERCEPTOR_ATTRIBUTE __attribute__((visibility("default")))
#ifdef ANDROID #ifdef ANDROID
struct MallocDebug { struct MallocDebug {
void* (*malloc)(size_t bytes); void* (*malloc)(size_t bytes);