From 40b0b46746d89b3984a5d41edb534f3fefa2f5bc Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Tue, 21 Mar 2017 06:55:32 +0000 Subject: [PATCH] Revert "Bypass potential libc's sysconf wrappers for sysconf(_SC_PAGESIZE) call" Bot can't find This reverts commit r298305. llvm-svn: 298343 --- compiler-rt/lib/sanitizer_common/sanitizer_linux.cc | 3 --- .../Linux/sysconf_interceptor_bypass_test.cc | 21 --------------------- 2 files changed, 24 deletions(-) delete mode 100644 compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc index 6b29523..24707c7 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc @@ -78,7 +78,6 @@ extern char **environ; // provided by crt1 #endif #if SANITIZER_LINUX -#include // struct kernel_timeval { long tv_sec; @@ -806,8 +805,6 @@ uptr GetPageSize() { return 4096; #elif SANITIZER_LINUX && (defined(__x86_64__) || defined(__i386__)) return EXEC_PAGESIZE; -#elif SANITIZER_LINUX - return getauxval(AT_PAGESZ); #else return sysconf(_SC_PAGESIZE); // EXEC_PAGESIZE may not be trustworthy. #endif diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc deleted file mode 100644 index 97b6132..0000000 --- a/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc +++ /dev/null @@ -1,21 +0,0 @@ -// RUN: %clangxx -O2 %s -o %t && %run %t 2>&1 | FileCheck %s - -#include - -extern "C" long sysconf(int name) { - fprintf(stderr, "sysconf wrapper called\n"); - return 0; -} - -int main() { - // All we need to check is that the sysconf() interceptor defined above was - // not called. Should it get called, it will crash right there, any - // instrumented code executed before sanitizer init is finished will crash - // accessing non-initialized sanitizer internals. Even if it will not crash - // in some configuration, it should never be called anyway. - fprintf(stderr, "Passed\n"); - // CHECK-NOT: sysconf wrapper called - // CHECK: Passed - // CHECK-NOT: sysconf wrapper called - return 0; -} -- 2.7.4