maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ASan] more macro for conditional interception of pread functions 

llvm-svn: 170112
This commit is contained in:
Alexey Samsonov 2012-12-13 08:10:23 +00:00
parent ad81738822
commit 65c14f5314
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler-rt/lib/asan/asan_intercepted_functions.h
View File

@ -153,11 +153,16 @@ DECLARE_FUNCTION_AND_WRAPPER(long long, atoll, const char *nptr); // NOLINT
DECLARE_FUNCTION_AND_WRAPPER(long long, strtoll, const char *nptr, char **endptr, int base); // NOLINT DECLARE_FUNCTION_AND_WRAPPER(long long, strtoll, const char *nptr, char **endptr, int base); // NOLINT
# endif # endif
// unistd.h
DECLARE_FUNCTION_AND_WRAPPER(SSIZE_T, read, int fd, void *buf, SIZE_T count); DECLARE_FUNCTION_AND_WRAPPER(SSIZE_T, read, int fd, void *buf, SIZE_T count);
# if SANITIZER_INTERCEPT_PREAD
DECLARE_FUNCTION_AND_WRAPPER(SSIZE_T, pread, int fd, void *buf, DECLARE_FUNCTION_AND_WRAPPER(SSIZE_T, pread, int fd, void *buf,
SIZE_T count, OFF_T offset); SIZE_T count, OFF_T offset);
# endif
# if SANITIZER_INTERCEPT_PREAD64
DECLARE_FUNCTION_AND_WRAPPER(SSIZE_T, pread64, int fd, void *buf, DECLARE_FUNCTION_AND_WRAPPER(SSIZE_T, pread64, int fd, void *buf,
SIZE_T count, OFF64_T offset); SIZE_T count, OFF64_T offset);
# endif
# if ASAN_INTERCEPT_MLOCKX # if ASAN_INTERCEPT_MLOCKX
// mlock/munlock // mlock/munlock

4
compiler-rt/lib/asan/tests/asan_test.cc
View File

@ -1606,7 +1606,7 @@ TEST(AddressSanitizer, pread) {
delete x; delete x;
} }
#ifndef ANDROID # if !defined(ANDROID) && !defined(__ANDROID__)
TEST(AddressSanitizer, pread64) { TEST(AddressSanitizer, pread64) {
char *x = new char[10]; char *x = new char[10];
int fd = open("/proc/self/stat", O_RDONLY); int fd = open("/proc/self/stat", O_RDONLY);
@ -1618,7 +1618,7 @@ TEST(AddressSanitizer, pread64) {
close(fd); close(fd);
delete x; delete x;
} }
#endif // ANDROID # endif // !defined(ANDROID) && !defined(__ANDROID__)
TEST(AddressSanitizer, read) { TEST(AddressSanitizer, read) {
char *x = new char[10]; char *x = new char[10];

22
compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.h
View File

@ -22,6 +22,12 @@
#include "interception/interception.h" #include "interception/interception.h"
#if !defined(_WIN32)
# define SANITIZER_INTERCEPT_PREAD 1
#else
# define SANITIZER_INTERCEPT_PREAD 0
#endif
#if defined(__linux__) && !defined(ANDROID) #if defined(__linux__) && !defined(ANDROID)
# define SANITIZER_INTERCEPT_PREAD64 1 # define SANITIZER_INTERCEPT_PREAD64 1
#else #else
@ -36,6 +42,7 @@ INTERCEPTOR(SSIZE_T, read, int fd, void *ptr, SIZE_T count) {
return res; return res;
} }
#if SANITIZER_INTERCEPT_PREAD
INTERCEPTOR(SSIZE_T, pread, int fd, void *ptr, SIZE_T count, OFF_T offset) { INTERCEPTOR(SSIZE_T, pread, int fd, void *ptr, SIZE_T count, OFF_T offset) {
COMMON_INTERCEPTOR_ENTER(pread, fd, ptr, count, offset); COMMON_INTERCEPTOR_ENTER(pread, fd, ptr, count, offset);
SSIZE_T res = REAL(pread)(fd, ptr, count, offset); SSIZE_T res = REAL(pread)(fd, ptr, count, offset);
@ -43,6 +50,7 @@ INTERCEPTOR(SSIZE_T, pread, int fd, void *ptr, SIZE_T count, OFF_T offset) {
COMMON_INTERCEPTOR_WRITE_RANGE(ptr, res); COMMON_INTERCEPTOR_WRITE_RANGE(ptr, res);
return res; return res;
} }
#endif
#if SANITIZER_INTERCEPT_PREAD64 #if SANITIZER_INTERCEPT_PREAD64
INTERCEPTOR(SSIZE_T, pread64, int fd, void *ptr, SIZE_T count, OFF64_T offset) { INTERCEPTOR(SSIZE_T, pread64, int fd, void *ptr, SIZE_T count, OFF64_T offset) {
@ -54,15 +62,21 @@ INTERCEPTOR(SSIZE_T, pread64, int fd, void *ptr, SIZE_T count, OFF64_T offset) {
} }
#endif #endif
#if SANITIZER_INTERCEPT_PREAD64 #if SANITIZER_INTERCEPT_PREAD
#define INIT_PREAD64 CHECK(INTERCEPT_FUNCTION(pread64)) # define INIT_PREAD CHECK(INTERCEPT_FUNCTION(pread))
#else #else
#define INIT_PREAD64 # define INIT_PREAD
#endif
#if SANITIZER_INTERCEPT_PREAD64
# define INIT_PREAD64 CHECK(INTERCEPT_FUNCTION(pread64))
#else
# define INIT_PREAD64
#endif #endif
#define SANITIZER_COMMON_INTERCEPTORS_INIT \ #define SANITIZER_COMMON_INTERCEPTORS_INIT \
CHECK(INTERCEPT_FUNCTION(read)); \ CHECK(INTERCEPT_FUNCTION(read)); \
CHECK(INTERCEPT_FUNCTION(pread)); \ INIT_PREAD; \
INIT_PREAD64; \ INIT_PREAD64; \
#endif // SANITIZER_COMMON_INTERCEPTORS_H #endif // SANITIZER_COMMON_INTERCEPTORS_H