<div style="white-space:pre-wrap">[+Qin, cl author]</div><br><div class="gmail_quote"><div dir="ltr">On Thu, May 19, 2016 at 09:10 Benjamin Kramer <<a href="mailto:benny.kra@gmail.com">benny.kra@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I had to revert this in r270076 as it breaks check-msan on linux. It<br>
looks like the interceptors that used to be #ifdef FREEBSD are now<br>
defined unconditionally?<br>
<br>
On Wed, May 18, 2016 at 10:49 PM, Mike Aizatsky via llvm-commits<br>
<<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br>
> Author: aizatsky<br>
> Date: Wed May 18 15:49:49 2016<br>
> New Revision: 269981<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=269981&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=269981&view=rev</a><br>
> Log:<br>
> [sanitizer] Move *fstat to the common interceptors<br>
><br>
> Summary:<br>
> Adds *fstat to the common interceptors.<br>
><br>
> Removes the now-duplicate fstat interceptor from msan/tsan<br>
> This adds fstat to asan/esan, which previously did not intercept it.<br>
><br>
> Resubmit of <a href="http://reviews.llvm.org/D20318" rel="noreferrer" target="_blank">http://reviews.llvm.org/D20318</a> with ios build fixes.<br>
><br>
> Reviewers: eugenis, vitalybuka, aizatsky<br>
><br>
> Subscribers: zaks.anna, kcc, bruening, kubabrecka, srhines, danalbert, tberghammer<br>
><br>
> Differential Revision: <a href="http://reviews.llvm.org/D20350" rel="noreferrer" target="_blank">http://reviews.llvm.org/D20350</a><br>
><br>
> Modified:<br>
> compiler-rt/trunk/lib/asan/asan_interceptors.cc<br>
> compiler-rt/trunk/lib/msan/msan_interceptors.cc<br>
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc<br>
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h<br>
> compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc<br>
><br>
> Modified: compiler-rt/trunk/lib/asan/asan_interceptors.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_interceptors.cc?rev=269981&r1=269980&r2=269981&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_interceptors.cc?rev=269981&r1=269980&r2=269981&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/lib/asan/asan_interceptors.cc (original)<br>
> +++ compiler-rt/trunk/lib/asan/asan_interceptors.cc Wed May 18 15:49:49 2016<br>
> @@ -168,6 +168,9 @@ DECLARE_REAL_AND_INTERCEPTOR(void, free,<br>
> #define COMMON_INTERCEPTOR_FD_RELEASE(ctx, fd) \<br>
> do { \<br>
> } while (false)<br>
> +#define COMMON_INTERCEPTOR_FD_ACCESS(ctx, fd) \<br>
> + do { \<br>
> + } while (false)<br>
> #define COMMON_INTERCEPTOR_FD_SOCKET_ACCEPT(ctx, fd, newfd) \<br>
> do { \<br>
> } while (false)<br>
><br>
> Modified: compiler-rt/trunk/lib/msan/msan_interceptors.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/msan_interceptors.cc?rev=269981&r1=269980&r2=269981&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/msan_interceptors.cc?rev=269981&r1=269980&r2=269981&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/lib/msan/msan_interceptors.cc (original)<br>
> +++ compiler-rt/trunk/lib/msan/msan_interceptors.cc Wed May 18 15:49:49 2016<br>
> @@ -684,64 +684,6 @@ INTERCEPTOR(int, putenv, char *string) {<br>
> return res;<br>
> }<br>
><br>
> -#if !SANITIZER_FREEBSD<br>
> -INTERCEPTOR(int, __fxstat, int magic, int fd, void *buf) {<br>
> - ENSURE_MSAN_INITED();<br>
> - int res = REAL(__fxstat)(magic, fd, buf);<br>
> - if (!res)<br>
> - __msan_unpoison(buf, __sanitizer::struct_stat_sz);<br>
> - return res;<br>
> -}<br>
> -#define MSAN_MAYBE_INTERCEPT___FXSTAT INTERCEPT_FUNCTION(__fxstat)<br>
> -#else<br>
> -#define MSAN_MAYBE_INTERCEPT___FXSTAT<br>
> -#endif<br>
> -<br>
> -#if !SANITIZER_FREEBSD<br>
> -INTERCEPTOR(int, __fxstat64, int magic, int fd, void *buf) {<br>
> - ENSURE_MSAN_INITED();<br>
> - int res = REAL(__fxstat64)(magic, fd, buf);<br>
> - if (!res)<br>
> - __msan_unpoison(buf, __sanitizer::struct_stat64_sz);<br>
> - return res;<br>
> -}<br>
> -#define MSAN_MAYBE_INTERCEPT___FXSTAT64 INTERCEPT_FUNCTION(__fxstat64)<br>
> -#else<br>
> -#define MSAN_MAYBE_INTERCEPT___FXSTAT64<br>
> -#endif<br>
> -<br>
> -#if SANITIZER_FREEBSD<br>
> -INTERCEPTOR(int, fstatat, int fd, char *pathname, void *buf, int flags) {<br>
> - ENSURE_MSAN_INITED();<br>
> - int res = REAL(fstatat)(fd, pathname, buf, flags);<br>
> - if (!res) __msan_unpoison(buf, __sanitizer::struct_stat_sz);<br>
> - return res;<br>
> -}<br>
> -# define MSAN_INTERCEPT_FSTATAT INTERCEPT_FUNCTION(fstatat)<br>
> -#else<br>
> -INTERCEPTOR(int, __fxstatat, int magic, int fd, char *pathname, void *buf,<br>
> - int flags) {<br>
> - ENSURE_MSAN_INITED();<br>
> - int res = REAL(__fxstatat)(magic, fd, pathname, buf, flags);<br>
> - if (!res) __msan_unpoison(buf, __sanitizer::struct_stat_sz);<br>
> - return res;<br>
> -}<br>
> -# define MSAN_INTERCEPT_FSTATAT INTERCEPT_FUNCTION(__fxstatat)<br>
> -#endif<br>
> -<br>
> -#if !SANITIZER_FREEBSD<br>
> -INTERCEPTOR(int, __fxstatat64, int magic, int fd, char *pathname, void *buf,<br>
> - int flags) {<br>
> - ENSURE_MSAN_INITED();<br>
> - int res = REAL(__fxstatat64)(magic, fd, pathname, buf, flags);<br>
> - if (!res) __msan_unpoison(buf, __sanitizer::struct_stat64_sz);<br>
> - return res;<br>
> -}<br>
> -#define MSAN_MAYBE_INTERCEPT___FXSTATAT64 INTERCEPT_FUNCTION(__fxstatat64)<br>
> -#else<br>
> -#define MSAN_MAYBE_INTERCEPT___FXSTATAT64<br>
> -#endif<br>
> -<br>
> INTERCEPTOR(int, pipe, int pipefd[2]) {<br>
> if (msan_init_is_running)<br>
> return REAL(pipe)(pipefd);<br>
> @@ -1303,6 +1245,9 @@ int OnExit() {<br>
> #define COMMON_INTERCEPTOR_FD_RELEASE(ctx, fd) \<br>
> do { \<br>
> } while (false)<br>
> +#define COMMON_INTERCEPTOR_FD_ACCESS(ctx, fd) \<br>
> + do { \<br>
> + } while (false)<br>
> #define COMMON_INTERCEPTOR_FD_SOCKET_ACCEPT(ctx, fd, newfd) \<br>
> do { \<br>
> } while (false)<br>
> @@ -1549,10 +1494,6 @@ void InitializeInterceptors() {<br>
> INTERCEPT_FUNCTION(putenv);<br>
> INTERCEPT_FUNCTION(gettimeofday);<br>
> INTERCEPT_FUNCTION(fcvt);<br>
> - MSAN_MAYBE_INTERCEPT___FXSTAT;<br>
> - MSAN_INTERCEPT_FSTATAT;<br>
> - MSAN_MAYBE_INTERCEPT___FXSTAT64;<br>
> - MSAN_MAYBE_INTERCEPT___FXSTATAT64;<br>
> INTERCEPT_FUNCTION(pipe);<br>
> INTERCEPT_FUNCTION(pipe2);<br>
> INTERCEPT_FUNCTION(socketpair);<br>
><br>
> Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc?rev=269981&r1=269980&r2=269981&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc?rev=269981&r1=269980&r2=269981&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc (original)<br>
> +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc Wed May 18 15:49:49 2016<br>
> @@ -5609,7 +5609,106 @@ INTERCEPTOR(int, __lxstat64, int version<br>
> #define INIT___LXSTAT64<br>
> #endif<br>
><br>
> -// FIXME: add other *stat interceptor<br>
> +#if SANITIZER_INTERCEPT_FSTAT<br>
> +INTERCEPTOR(int, fstat, int fd, void *buf) {<br>
> + void *ctx;<br>
> + COMMON_INTERCEPTOR_ENTER(ctx, fstat, fd, buf);<br>
> + if (common_flags()->intercept_stat && fd > 0)<br>
> + COMMON_INTERCEPTOR_FD_ACCESS(ctx, fd);<br>
> + int res = REAL(fstat)(fd, buf);<br>
> + if (!res)<br>
> + COMMON_INTERCEPTOR_WRITE_RANGE(ctx, buf, __sanitizer::struct_stat_sz);<br>
> + return res;<br>
> +}<br>
> +#define INIT_FSTAT COMMON_INTERCEPT_FUNCTION(fstat)<br>
> +#else<br>
> +#define INIT_FSTAT<br>
> +#endif<br>
> +<br>
> +#if SANITIZER_INTERCEPT___FXSTAT<br>
> +INTERCEPTOR(int, __fxstat, int version, int fd, void *buf) {<br>
> + void *ctx;<br>
> + COMMON_INTERCEPTOR_ENTER(ctx, __fxstat, version, fd, buf);<br>
> + if (common_flags()->intercept_stat && fd > 0)<br>
> + COMMON_INTERCEPTOR_FD_ACCESS(ctx, fd);<br>
> + int res = REAL(__fxstat)(version, fd, buf);<br>
> + if (!res)<br>
> + COMMON_INTERCEPTOR_WRITE_RANGE(ctx, buf, __sanitizer::struct_stat_sz);<br>
> + return res;<br>
> +}<br>
> +#define INIT___FXSTAT COMMON_INTERCEPT_FUNCTION(__fxstat)<br>
> +#else<br>
> +#define INIT___FXSTAT<br>
> +#endif<br>
> +<br>
> +#if SANITIZER_INTERCEPT___FXSTAT64<br>
> +INTERCEPTOR(int, __fxstat64, int version, int fd, void *buf) {<br>
> + void *ctx;<br>
> + COMMON_INTERCEPTOR_ENTER(ctx, __fxstat64, version, fd, buf);<br>
> + if (common_flags()->intercept_stat && fd > 0)<br>
> + COMMON_INTERCEPTOR_FD_ACCESS(ctx, fd);<br>
> + int res = REAL(__fxstat64)(version, fd, buf);<br>
> + if (!res)<br>
> + COMMON_INTERCEPTOR_WRITE_RANGE(ctx, buf, __sanitizer::struct_stat64_sz);<br>
> + return res;<br>
> +}<br>
> +#define INIT___FXSTAT64 COMMON_INTERCEPT_FUNCTION(__fxstat64)<br>
> +#else<br>
> +#define INIT___FXSTAT64<br>
> +#endif<br>
> +<br>
> +#if SANITIZER_INTERCEPT_FSTATAT<br>
> +INTERCEPTOR(int, fstatat, int fd, char *pathname, void *buf, int flags) {<br>
> + void *ctx;<br>
> + COMMON_INTERCEPTOR_ENTER(ctx, fstatat, fd, pathname, buf, flags);<br>
> + if (common_flags()->intercept_stat)<br>
> + COMMON_INTERCEPTOR_READ_STRING(ctx, pathname, 0);<br>
> + int res = REAL(fstatat)(fd, pathname, buf, flags);<br>
> + if (!res)<br>
> + COMMON_INTERCEPTOR_WRITE_RANGE(ctx, buf, __sanitizer::struct_stat_sz);<br>
> + return res;<br>
> +}<br>
> +#define INIT_FSTATAT COMMON_INTERCEPT_FUNCTION(fstatat);<br>
> +#else<br>
> +#define INIT_FSTATAT<br>
> +#endif<br>
> +<br>
> +#if SANITIZER_INTERCEPT___FXSTATAT<br>
> +INTERCEPTOR(int, __fxstatat, int version, int fd, char *pathname, void *buf,<br>
> + int flags) {<br>
> + void *ctx;<br>
> + COMMON_INTERCEPTOR_ENTER(ctx, __fxstatat, version, fd, pathname, buf, flags);<br>
> + if (common_flags()->intercept_stat)<br>
> + COMMON_INTERCEPTOR_READ_STRING(ctx, pathname, 0);<br>
> + int res = REAL(__fxstatat)(fd, version, pathname, buf, flags);<br>
> + if (!res) {<br>
> + COMMON_INTERCEPTOR_WRITE_RANGE(ctx, buf, __sanitizer::struct_stat_sz);<br>
> + }<br>
> + return res;<br>
> +}<br>
> +#define INIT___FXSTATAT COMMON_INTERCEPT_FUNCTION(__fxstatat);<br>
> +#else<br>
> +#define INIT___FXSTATAT<br>
> +#endif<br>
> +<br>
> +#if SANITIZER_INTERCEPT___FXSTATAT64<br>
> +INTERCEPTOR(int, __fxstatat64, int version, int fd, char *pathname, void *buf,<br>
> + int flags) {<br>
> + void *ctx;<br>
> + COMMON_INTERCEPTOR_ENTER(ctx, __fxstatat64, version, fd, pathname, buf,<br>
> + flags);<br>
> + if (common_flags()->intercept_stat)<br>
> + COMMON_INTERCEPTOR_READ_STRING(ctx, pathname, 0);<br>
> + int res = REAL(__fxstatat64)(fd, version, pathname, buf, flags);<br>
> + if (!res) {<br>
> + COMMON_INTERCEPTOR_WRITE_RANGE(ctx, buf, __sanitizer::struct_stat64_sz);<br>
> + }<br>
> + return res;<br>
> +}<br>
> +#define INIT___FXSTATAT64 COMMON_INTERCEPT_FUNCTION(__fxstatat64);<br>
> +#else<br>
> +#define INIT___FXSTATAT64<br>
> +#endif<br>
><br>
> static void InitializeCommonInterceptors() {<br>
> static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];<br>
> @@ -5801,5 +5900,10 @@ static void InitializeCommonInterceptors<br>
> INIT___XSTAT64;<br>
> INIT___LXSTAT;<br>
> INIT___LXSTAT64;<br>
> - // FIXME: add other *stat interceptors.<br>
> + INIT_FSTAT;<br>
> + INIT___FXSTAT;<br>
> + INIT___FXSTAT64;<br>
> + INIT_FSTATAT;<br>
> + INIT___FXSTATAT;<br>
> + INIT___FXSTATAT64;<br>
> }<br>
><br>
> Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h?rev=269981&r1=269980&r2=269981&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h?rev=269981&r1=269980&r2=269981&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h (original)<br>
> +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h Wed May 18 15:49:49 2016<br>
> @@ -306,4 +306,10 @@<br>
> #define SANITIZER_INTERCEPT___XSTAT64 SI_LINUX_NOT_ANDROID<br>
> #define SANITIZER_INTERCEPT___LXSTAT SANITIZER_INTERCEPT___XSTAT<br>
> #define SANITIZER_INTERCEPT___LXSTAT64 SI_LINUX_NOT_ANDROID<br>
> +#define SANITIZER_INTERCEPT_FSTAT SANITIZER_INTERCEPT_STAT<br>
> +#define SANITIZER_INTERCEPT___FXSTAT SANITIZER_INTERCEPT___XSTAT<br>
> +#define SANITIZER_INTERCEPT___FXSTAT64 SI_LINUX_NOT_ANDROID<br>
> +#define SANITIZER_INTERCEPT_FSTATAT SI_FREEBSD<br>
> +#define SANITIZER_INTERCEPT___FXSTATAT SANITIZER_INTERCEPT___XSTAT<br>
> +#define SANITIZER_INTERCEPT___FXSTATAT64 SI_LINUX_NOT_ANDROID<br>
> #endif // #ifndef SANITIZER_PLATFORM_INTERCEPTORS_H<br>
><br>
> Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc?rev=269981&r1=269980&r2=269981&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc?rev=269981&r1=269980&r2=269981&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc (original)<br>
> +++ compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc Wed May 18 15:49:49 2016<br>
> @@ -1358,56 +1358,6 @@ TSAN_INTERCEPTOR(int, pthread_once, void<br>
> return 0;<br>
> }<br>
><br>
> -#if SANITIZER_LINUX && !SANITIZER_ANDROID<br>
> -TSAN_INTERCEPTOR(int, __fxstat, int version, int fd, void *buf) {<br>
> - SCOPED_TSAN_INTERCEPTOR(__fxstat, version, fd, buf);<br>
> - if (fd > 0)<br>
> - FdAccess(thr, pc, fd);<br>
> - return REAL(__fxstat)(version, fd, buf);<br>
> -}<br>
> -#define TSAN_MAYBE_INTERCEPT___FXSTAT TSAN_INTERCEPT(__fxstat)<br>
> -#else<br>
> -#define TSAN_MAYBE_INTERCEPT___FXSTAT<br>
> -#endif<br>
> -<br>
> -TSAN_INTERCEPTOR(int, fstat, int fd, void *buf) {<br>
> -#if SANITIZER_FREEBSD || SANITIZER_MAC || SANITIZER_ANDROID<br>
> - SCOPED_TSAN_INTERCEPTOR(fstat, fd, buf);<br>
> - if (fd > 0)<br>
> - FdAccess(thr, pc, fd);<br>
> - return REAL(fstat)(fd, buf);<br>
> -#else<br>
> - SCOPED_TSAN_INTERCEPTOR(__fxstat, 0, fd, buf);<br>
> - if (fd > 0)<br>
> - FdAccess(thr, pc, fd);<br>
> - return REAL(__fxstat)(0, fd, buf);<br>
> -#endif<br>
> -}<br>
> -<br>
> -#if SANITIZER_LINUX && !SANITIZER_ANDROID<br>
> -TSAN_INTERCEPTOR(int, __fxstat64, int version, int fd, void *buf) {<br>
> - SCOPED_TSAN_INTERCEPTOR(__fxstat64, version, fd, buf);<br>
> - if (fd > 0)<br>
> - FdAccess(thr, pc, fd);<br>
> - return REAL(__fxstat64)(version, fd, buf);<br>
> -}<br>
> -#define TSAN_MAYBE_INTERCEPT___FXSTAT64 TSAN_INTERCEPT(__fxstat64)<br>
> -#else<br>
> -#define TSAN_MAYBE_INTERCEPT___FXSTAT64<br>
> -#endif<br>
> -<br>
> -#if SANITIZER_LINUX && !SANITIZER_ANDROID<br>
> -TSAN_INTERCEPTOR(int, fstat64, int fd, void *buf) {<br>
> - SCOPED_TSAN_INTERCEPTOR(__fxstat64, 0, fd, buf);<br>
> - if (fd > 0)<br>
> - FdAccess(thr, pc, fd);<br>
> - return REAL(__fxstat64)(0, fd, buf);<br>
> -}<br>
> -#define TSAN_MAYBE_INTERCEPT_FSTAT64 TSAN_INTERCEPT(fstat64)<br>
> -#else<br>
> -#define TSAN_MAYBE_INTERCEPT_FSTAT64<br>
> -#endif<br>
> -<br>
> TSAN_INTERCEPTOR(int, open, const char *name, int flags, int mode) {<br>
> SCOPED_TSAN_INTERCEPTOR(open, name, flags, mode);<br>
> READ_STRING(thr, pc, name, 0);<br>
> @@ -2536,10 +2486,6 @@ void InitializeInterceptors() {<br>
><br>
> TSAN_INTERCEPT(pthread_once);<br>
><br>
> - TSAN_INTERCEPT(fstat);<br>
> - TSAN_MAYBE_INTERCEPT___FXSTAT;<br>
> - TSAN_MAYBE_INTERCEPT_FSTAT64;<br>
> - TSAN_MAYBE_INTERCEPT___FXSTAT64;<br>
> TSAN_INTERCEPT(open);<br>
> TSAN_MAYBE_INTERCEPT_OPEN64;<br>
> TSAN_INTERCEPT(creat);<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>