[compiler-rt] r327752 - [asan] Replace vfork with fork.
Evgeniy Stepanov via llvm-commits
llvm-commits at lists.llvm.org
Fri Mar 16 15:15:05 PDT 2018
Author: eugenis
Date: Fri Mar 16 15:15:05 2018
New Revision: 327752
URL: http://llvm.org/viewvc/llvm-project?rev=327752&view=rev
Log:
[asan] Replace vfork with fork.
Summary:
vfork is not ASan-friendly because it modifies stack shadow in the
parent process address space. While it is possible to compensate for that with, for example,
__asan_handle_no_return before each call to _exit or execve and friends, simply replacing
vfork with fork looks like by far the easiest solution.
Posix compliant programs can not detect the difference between vfork and fork.
Fixes https://github.com/google/sanitizers/issues/925
Reviewers: kcc, vitalybuka
Subscribers: kubamracek, llvm-commits
Differential Revision: https://reviews.llvm.org/D44587
Added:
compiler-rt/trunk/test/asan/TestCases/Posix/vfork.cc
Modified:
compiler-rt/trunk/lib/asan/asan_interceptors.cc
compiler-rt/trunk/lib/asan/asan_interceptors.h
Modified: compiler-rt/trunk/lib/asan/asan_interceptors.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_interceptors.cc?rev=327752&r1=327751&r2=327752&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_interceptors.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_interceptors.cc Fri Mar 16 15:15:05 2018
@@ -572,6 +572,13 @@ INTERCEPTOR(int, __cxa_atexit, void (*fu
}
#endif // ASAN_INTERCEPT___CXA_ATEXIT
+#if ASAN_INTERCEPT_VFORK
+extern "C" int fork(void);
+INTERCEPTOR(int, vfork, void) {
+ return fork();
+}
+#endif // ASAN_INTERCEPT_VFORK
+
// ---------------------- InitializeAsanInterceptors ---------------- {{{1
namespace __asan {
void InitializeAsanInterceptors() {
@@ -649,6 +656,10 @@ void InitializeAsanInterceptors() {
ASAN_INTERCEPT_FUNC(__cxa_atexit);
#endif
+#if ASAN_INTERCEPT_VFORK
+ ASAN_INTERCEPT_FUNC(vfork);
+#endif
+
InitializePlatformInterceptors();
VReport(1, "AddressSanitizer: libc interceptors initialized\n");
Modified: compiler-rt/trunk/lib/asan/asan_interceptors.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_interceptors.h?rev=327752&r1=327751&r2=327752&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_interceptors.h (original)
+++ compiler-rt/trunk/lib/asan/asan_interceptors.h Fri Mar 16 15:15:05 2018
@@ -46,11 +46,13 @@ void InitializePlatformInterceptors();
# define ASAN_INTERCEPT__LONGJMP 1
# define ASAN_INTERCEPT_INDEX 1
# define ASAN_INTERCEPT_PTHREAD_CREATE 1
+# define ASAN_INTERCEPT_VFORK 1
#else
# define ASAN_INTERCEPT_ATOLL_AND_STRTOLL 0
# define ASAN_INTERCEPT__LONGJMP 0
# define ASAN_INTERCEPT_INDEX 0
# define ASAN_INTERCEPT_PTHREAD_CREATE 0
+# define ASAN_INTERCEPT_VFORK 0
#endif
#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD || \
Added: compiler-rt/trunk/test/asan/TestCases/Posix/vfork.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Posix/vfork.cc?rev=327752&view=auto
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Posix/vfork.cc (added)
+++ compiler-rt/trunk/test/asan/TestCases/Posix/vfork.cc Fri Mar 16 15:15:05 2018
@@ -0,0 +1,30 @@
+// Test that vfork() is fork().
+// https://github.com/google/sanitizers/issues/925
+
+// RUN: %clangxx_asan -O0 %s -o %t && %run %t 2>&1
+
+#include <assert.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+int volatile global;
+
+int main(int argc, char **argv) {
+ pid_t pid = vfork();
+ if (pid) {
+ // parent
+ int status;
+ int res;
+ do {
+ res = waitpid(pid, &status, 0);
+ } while (res >= 0 && !WIFEXITED(status) && !WIFSIGNALED(status));
+ assert(global == 0);
+ } else {
+ // child
+ global = 42;
+ _exit(0);
+ }
+
+ return 0;
+}
More information about the llvm-commits
mailing list