[PATCH] D65221: [Sanitizer][ASAN][MSAN] Fix infinite recursion on FreeBSD

[Alexander Richardson via Phabricator via llvm-commits]

arichardson updated this revision to Diff 211900.
arichardson added a comment.

- Address review feedback
- Remove XFAIL: freebsd from another test that now passes


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D65221/new/

https://reviews.llvm.org/D65221

Files:
  compiler-rt/lib/asan/asan_posix.cc
  compiler-rt/lib/msan/msan_linux.cc
  compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
  compiler-rt/test/asan/TestCases/Posix/fread_fwrite.cc
  compiler-rt/test/asan/TestCases/Posix/tsd_dtor_leak.cc
  compiler-rt/test/msan/tzset.cc


Index: compiler-rt/test/msan/tzset.cc
===================================================================
--- compiler-rt/test/msan/tzset.cc
+++ compiler-rt/test/msan/tzset.cc
@@ -1,5 +1,4 @@
 // RUN: %clangxx_msan -O0 %s -o %t && %run %t
-// XFAIL: freebsd
 
 #include <stdlib.h>
 #include <string.h>
Index: compiler-rt/test/asan/TestCases/Posix/tsd_dtor_leak.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Posix/tsd_dtor_leak.cc
+++ compiler-rt/test/asan/TestCases/Posix/tsd_dtor_leak.cc
@@ -3,8 +3,6 @@
 // RUN: %clangxx_asan -O1 %s -pthread -o %t
 // RUN: %env_asan_opts=quarantine_size_mb=0 %run %t
 // XFAIL: x86_64-netbsd
-// Assertion fails
-// XFAIL: x86_64-freebsd
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
Index: compiler-rt/test/asan/TestCases/Posix/fread_fwrite.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Posix/fread_fwrite.cc
+++ compiler-rt/test/asan/TestCases/Posix/fread_fwrite.cc
@@ -1,9 +1,6 @@
 // RUN: %clangxx_asan -g %s -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-FWRITE
 // RUN: not %run %t 1 2>&1 | FileCheck %s --check-prefix=CHECK-FREAD
-//
-// On FreeBSD stack overflow error instead
-// XFAIL: freebsd
 
 #include <stdio.h>
 #include <stdlib.h>
Index: compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+++ compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
@@ -777,9 +777,15 @@
 }
 
 #if SANITIZER_FREEBSD
+using syctlbyname_ptr = int (*)(const char *sname, void *oldp, size_t *oldlenp,
+                                const void *newp, size_t newlen);
 int internal_sysctlbyname(const char *sname, void *oldp, uptr *oldlenp,
                           const void *newp, uptr newlen) {
-  return sysctlbyname(sname, oldp, (size_t *)oldlenp, newp, (size_t)newlen);
+  static syctlbyname_ptr real_sysctlbyname = nullptr;
+  if (!real_sysctlbyname)
+    real_sysctlbyname = (syctlbyname_ptr)dlfunc(RTLD_NEXT, "sysctlbyname");
+  CHECK(real_sysctlbyname);
+  return real_sysctlbyname(sname, oldp, (size_t *)oldlenp, newp, (size_t)newlen);
 }
 #endif
 #endif
Index: compiler-rt/lib/msan/msan_linux.cc
===================================================================
--- compiler-rt/lib/msan/msan_linux.cc
+++ compiler-rt/lib/msan/msan_linux.cc
@@ -174,7 +174,7 @@
 
 // ---------------------- TSD ---------------- {{{1
 
-#if SANITIZER_NETBSD || SANITIZER_FREEBSD
+#if SANITIZER_NETBSD
 // Thread Static Data cannot be used in early init on NetBSD and FreeBSD.
 // Reuse the MSan TSD API for compatibility with existing code
 // with an alternative implementation.
Index: compiler-rt/lib/asan/asan_posix.cc
===================================================================
--- compiler-rt/lib/asan/asan_posix.cc
+++ compiler-rt/lib/asan/asan_posix.cc
@@ -39,7 +39,7 @@
 
 // ---------------------- TSD ---------------- {{{1
 
-#if SANITIZER_NETBSD || SANITIZER_FREEBSD
+#if SANITIZER_NETBSD
 // Thread Static Data cannot be used in early init on NetBSD and FreeBSD.
 // Reuse the Asan TSD API for compatibility with existing code
 // with an alternative implementation.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D65221.211900.patch
Type: text/x-patch
Size: 3296 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190726/4e3a6183/attachment-0001.bin>