This is an archive of the discontinued LLVM Phabricator instance.

Differential D47641

[asan, myriad] Configure platform interceptors
ClosedPublic

Authored by waltl on Jun 1 2018, 8:56 AM.

Details

Reviewers
vitalybuka
eugenis
alekseyshl
Commits
rGbf03bfb0a33a: [asan, myriad] Configure platform interceptors
rCRT333784: [asan, myriad] Configure platform interceptors
rL333784: [asan, myriad] Configure platform interceptors
Summary

Myriad only uses the platform interceptors for memory allocation
routines. Configure them properly.

Also add a missing guard around aligned alloc interceptor.

Diff Detail

Repository
rL LLVM

Event Timeline

waltl created this revision.Jun 1 2018, 8:56 AM
Harbormaster completed remote builds in B18836: Diff 149491.Jun 1 2018, 8:56 AM
Herald added a subscriber: kubamracek. · View Herald TranscriptJun 1 2018, 8:56 AM
alekseyshl accepted this revision.Jun 1 2018, 12:48 PM
This revision is now accepted and ready to land.Jun 1 2018, 12:48 PM
Closed by commit rL333784: [asan, myriad] Configure platform interceptors (authored by waltl). · Explain WhyJun 1 2018, 12:51 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: delcypher. · View Herald TranscriptJun 1 2018, 12:51 PM

Revision Contents

PathSize
compiler-rt/
trunk/
lib/
asan/
2 lines
sanitizer_common/
19 lines

Diff 149535

compiler-rt/trunk/lib/asan/asan_malloc_linux.cc

Show First 20 Lines • Show All 126 Lines • ▼ Show 20 Lines
INTERCEPTOR(void*, __libc_memalign, uptr boundary, uptr size) { INTERCEPTOR(void*, __libc_memalign, uptr boundary, uptr size) {
GET_STACK_TRACE_MALLOC; GET_STACK_TRACE_MALLOC;
void *res = asan_memalign(boundary, size, &stack, FROM_MALLOC); void *res = asan_memalign(boundary, size, &stack, FROM_MALLOC);
DTLS_on_libc_memalign(res, size); DTLS_on_libc_memalign(res, size);
return res; return res;
} }
#endif // SANITIZER_INTERCEPT_MEMALIGN #endif // SANITIZER_INTERCEPT_MEMALIGN
#if SANITIZER_INTERCEPT_ALIGNED_ALLOC
INTERCEPTOR(void*, aligned_alloc, uptr boundary, uptr size) { INTERCEPTOR(void*, aligned_alloc, uptr boundary, uptr size) {
GET_STACK_TRACE_MALLOC; GET_STACK_TRACE_MALLOC;
return asan_memalign(boundary, size, &stack, FROM_MALLOC); return asan_memalign(boundary, size, &stack, FROM_MALLOC);
} }
#endif // SANITIZER_INTERCEPT_ALIGNED_ALLOC
INTERCEPTOR(uptr, malloc_usable_size, void *ptr) { INTERCEPTOR(uptr, malloc_usable_size, void *ptr) {
GET_CURRENT_PC_BP_SP; GET_CURRENT_PC_BP_SP;
(void)sp; (void)sp;
return asan_malloc_usable_size(ptr, pc, bp); return asan_malloc_usable_size(ptr, pc, bp);
} }
#if SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO #if SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO
▲ Show 20 Lines • Show All 103 Lines • Show Last 20 Lines

compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h

Show First 20 Lines • Show All 89 Lines • ▼ Show 20 Lines
#endif #endif
#if SANITIZER_FUCHSIA #if SANITIZER_FUCHSIA
# define SI_NOT_FUCHSIA 0 # define SI_NOT_FUCHSIA 0
#else #else
# define SI_NOT_FUCHSIA 1 # define SI_NOT_FUCHSIA 1
#endif #endif
#if SANITIZER_RTEMS
# define SI_NOT_RTEMS 0
#else
# define SI_NOT_RTEMS 1
#endif
#if SANITIZER_SOLARIS #if SANITIZER_SOLARIS
# define SI_SOLARIS 1 # define SI_SOLARIS 1
#else #else
# define SI_SOLARIS 0 # define SI_SOLARIS 0
#endif #endif
#if SANITIZER_SOLARIS32 #if SANITIZER_SOLARIS32
# define SI_SOLARIS32 1 # define SI_SOLARIS32 1
▲ Show 20 Lines • Show All 341 Lines • ▼ Show 20 Lines#define SANITIZER_INTERCEPT_UTMPX \
(SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD || SI_NETBSD) (SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD || SI_NETBSD)
#define SANITIZER_INTERCEPT_GETLOADAVG \ #define SANITIZER_INTERCEPT_GETLOADAVG \
(SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD || SI_NETBSD || SI_OPENBSD) (SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD || SI_NETBSD || SI_OPENBSD)
#define SANITIZER_INTERCEPT_MMAP SI_POSIX #define SANITIZER_INTERCEPT_MMAP SI_POSIX
#define SANITIZER_INTERCEPT_MMAP64 SI_LINUX_NOT_ANDROID #define SANITIZER_INTERCEPT_MMAP64 SI_LINUX_NOT_ANDROID
#define SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO \ #define SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO \
(!SI_FREEBSD && !SI_MAC && !SI_NETBSD && !SI_OPENBSD && SI_NOT_FUCHSIA) (!SI_FREEBSD && !SI_MAC && !SI_NETBSD && !SI_OPENBSD && SI_NOT_FUCHSIA && \
SI_NOT_RTEMS)
#define SANITIZER_INTERCEPT_MEMALIGN \ #define SANITIZER_INTERCEPT_MEMALIGN \
(!SI_FREEBSD && !SI_MAC && !SI_NETBSD && !SI_OPENBSD) (!SI_FREEBSD && !SI_MAC && !SI_NETBSD && !SI_OPENBSD && SI_NOT_RTEMS)
#define SANITIZER_INTERCEPT_PVALLOC \ #define SANITIZER_INTERCEPT_PVALLOC \
(!SI_FREEBSD && !SI_MAC && !SI_NETBSD && !SI_OPENBSD && SI_NOT_FUCHSIA) (!SI_FREEBSD && !SI_MAC && !SI_NETBSD && !SI_OPENBSD && SI_NOT_FUCHSIA && \
SI_NOT_RTEMS)
#define SANITIZER_INTERCEPT_CFREE \ #define SANITIZER_INTERCEPT_CFREE \
(!SI_FREEBSD && !SI_MAC && !SI_NETBSD && !SI_OPENBSD && SI_NOT_FUCHSIA) (!SI_FREEBSD && !SI_MAC && !SI_NETBSD && !SI_OPENBSD && SI_NOT_FUCHSIA && \
#define SANITIZER_INTERCEPT_ALIGNED_ALLOC (!SI_MAC) SI_NOT_RTEMS)
#define SANITIZER_INTERCEPT_ALIGNED_ALLOC (!SI_MAC && SI_NOT_RTEMS)
#define SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE (!SI_MAC && !SI_OPENBSD) #define SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE (!SI_MAC && !SI_OPENBSD)
#define SANITIZER_INTERCEPT_MCHECK_MPROBE SI_LINUX_NOT_ANDROID #define SANITIZER_INTERCEPT_MCHECK_MPROBE SI_LINUX_NOT_ANDROID
#define SANITIZER_INTERCEPT_WCSCAT SI_POSIX #define SANITIZER_INTERCEPT_WCSCAT SI_POSIX
#define SANITIZER_INTERCEPT_SIGNAL_AND_SIGACTION (!SI_WINDOWS && SI_NOT_FUCHSIA) #define SANITIZER_INTERCEPT_SIGNAL_AND_SIGACTION (!SI_WINDOWS && SI_NOT_FUCHSIA)
#define SANITIZER_INTERCEPT_BSD_SIGNAL SI_ANDROID #define SANITIZER_INTERCEPT_BSD_SIGNAL SI_ANDROID
#define SANITIZER_INTERCEPT_ACCT (SI_NETBSD || SI_OPENBSD || SI_FREEBSD) #define SANITIZER_INTERCEPT_ACCT (SI_NETBSD || SI_OPENBSD || SI_FREEBSD)
#define SANITIZER_INTERCEPT_USER_FROM_UID SI_NETBSD #define SANITIZER_INTERCEPT_USER_FROM_UID SI_NETBSD
Show All 31 Lines