[ASan] Don't instrument globals in .preinit_array/.init_array/.fini_array

These sections contain pointers to function that should be invoked
during startup/shutdown by __libc_csu_init and __libc_csu_fini.
Instrumenting these globals will append redzone to them, which will be
filled with zeroes. This will cause null pointer dereference at runtime.

Merge ASan regression tests for globals that should be ignored by
instrumentation pass.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@247734 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/lib/Transforms/Instrumentation/AddressSanitizer.cpp
index ce29ff9ecfbaaa93c2d609b321ed07b184bdaf51..54c95d438f3ff5ccfad882c25372ed9cc5675163 100644 (file)
--- a/lib/Transforms/Instrumentation/AddressSanitizer.cpp
+++ b/lib/Transforms/Instrumentation/AddressSanitizer.cpp
@@ -1187,6 +1187,14 @@ bool AddressSanitizerModule::ShouldInstrumentGlobal(GlobalVariable *G) {
     // Do not instrument globals from special LLVM sections.
     if (Section.find("__llvm") != StringRef::npos) return false;
 
+    // Do not instrument function pointers to initialization and termination
+    // routines: dynamic linker will not properly handle redzones.
+    if (Section.startswith(".preinit_array") ||
+        Section.startswith(".init_array") ||
+        Section.startswith(".fini_array")) {
+      return false;
+    }
+
     // Callbacks put into the CRT initializer/terminator sections
     // should not be instrumented.
     // See https://code.google.com/p/address-sanitizer/issues/detail?id=305

diff --git a/test/Instrumentation/AddressSanitizer/do-not-instrument-cstring.ll b/test/Instrumentation/AddressSanitizer/do-not-instrument-cstring.ll
deleted file mode 100644 (file)
index f096ac1..0000000
--- a/test/Instrumentation/AddressSanitizer/do-not-instrument-cstring.ll
+++ /dev/null
@@ -1,8 +0,0 @@
-; RUN: opt < %s -asan -asan-module -S | FileCheck %s
-
-target datalayout = "e"
-target triple = "x86_64-apple-darwin10.0.0"
-
-@foo = private global [19 x i8] c"scannerWithString:\00", section "__TEXT,__objc_methname,cstring_literals"
-
-; CHECK: @foo = private global [19 x i8] c"scannerWithString:\00", section "__TEXT,__objc_methname,cstring_literals"
\ No newline at end of file

diff --git a/test/Instrumentation/AddressSanitizer/do-not-instrument-globals-darwin.ll b/test/Instrumentation/AddressSanitizer/do-not-instrument-globals-darwin.ll
new file mode 100644 (file)
index 0000000..854f5cb
--- /dev/null
+++ b/test/Instrumentation/AddressSanitizer/do-not-instrument-globals-darwin.ll
@@ -0,0 +1,19 @@
+; This test checks that we are not instrumenting unnecessary globals
+; (llvm.metadata and other llvm internal globals).
+; RUN: opt < %s -asan -asan-module -S | FileCheck %s
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-apple-macosx10.10.0"
+
+@foo_noinst = private global [19 x i8] c"scannerWithString:\00", section "__TEXT,__objc_methname,cstring_literals"
+
+; CHECK: @foo_noinst = private global [19 x i8] c"scannerWithString:\00", section "__TEXT,__objc_methname,cstring_literals"
+
+@.str_noinst = private unnamed_addr constant [4 x i8] c"aaa\00", section "llvm.metadata"
+@.str_noinst_prof = private unnamed_addr constant [4 x i8] c"aaa\00", section "__DATA,__llvm_covmap"
+@.str_inst = private unnamed_addr constant [4 x i8] c"aaa\00"
+
+; CHECK-NOT: {{asan_gen.*str_noinst}}
+; CHECK-NOT: {{asan_gen.*str_noinst_prof}}
+; CHECK: {{asan_gen.*str_inst}}
+; CHECK: @asan.module_ctor

diff --git a/test/Instrumentation/AddressSanitizer/do-not-instrument-globals-linux.ll b/test/Instrumentation/AddressSanitizer/do-not-instrument-globals-linux.ll
new file mode 100644 (file)
index 0000000..fc0e676
--- /dev/null
+++ b/test/Instrumentation/AddressSanitizer/do-not-instrument-globals-linux.ll
@@ -0,0 +1,35 @@
+; This test checks that we are not instrumenting unnecessary globals
+; (llvm.metadata, init_array sections, and other llvm internal globals).
+; RUN: opt < %s -asan -asan-module -S | FileCheck %s
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+; Function Attrs: nounwind uwtable
+define internal void @_ZL3foov() #0 {
+entry:
+  ret void
+}
+
+@__call_foo = global void ()* @_ZL3foov, section ".preinit_array", align 8
+@__call_foo_2 = global void ()* @_ZL3foov, section ".init_array", align 8
+@__call_foo_3 = global void ()* @_ZL3foov, section ".fini_array", align 8
+
+; CHECK-NOT: asan_gen{{.*}}__call_foo
+
+; Function Attrs: nounwind uwtable
+define i32 @main() #0 {
+entry:
+  %retval = alloca i32, align 4
+  store i32 0, i32* %retval, align 4
+  ret i32 0
+}
+
+@.str_noinst = private unnamed_addr constant [4 x i8] c"aaa\00", section "llvm.metadata"
+@.str_noinst_prof = private unnamed_addr constant [4 x i8] c"aaa\00", section "__llvm_prf_data"
+@.str_inst = private unnamed_addr constant [4 x i8] c"aaa\00"
+
+; CHECK-NOT: {{asan_gen.*str_noinst}}
+; CHECK-NOT: {{asan_gen.*str_noinst_prof}}
+; CHECK: {{asan_gen.*str_inst}}
+; CHECK: @asan.module_ctor

diff --git a/test/Instrumentation/AddressSanitizer/do-not-instrument-llvm-metadata-darwin.ll b/test/Instrumentation/AddressSanitizer/do-not-instrument-llvm-metadata-darwin.ll
deleted file mode 100644 (file)
index f67155a..0000000
--- a/test/Instrumentation/AddressSanitizer/do-not-instrument-llvm-metadata-darwin.ll
+++ /dev/null
@@ -1,15 +0,0 @@
-; This test checks that we are not instrumenting globals in llvm.metadata
-; and other llvm internal globals.
-; RUN: opt < %s -asan -asan-module -S | FileCheck %s
-
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.10.0"
-
-@.str_noinst = private unnamed_addr constant [4 x i8] c"aaa\00", section "llvm.metadata"
-@.str_noinst_prof = private unnamed_addr constant [4 x i8] c"aaa\00", section "__DATA,__llvm_covmap"
-@.str_inst = private unnamed_addr constant [4 x i8] c"aaa\00"
-
-; CHECK-NOT: {{asan_gen.*str_noinst}}
-; CHECK-NOT: {{asan_gen.*str_noinst_prof}}
-; CHECK: {{asan_gen.*str_inst}}
-; CHECK: @asan.module_ctor

diff --git a/test/Instrumentation/AddressSanitizer/do-not-instrument-llvm-metadata.ll b/test/Instrumentation/AddressSanitizer/do-not-instrument-llvm-metadata.ll
deleted file mode 100644 (file)
index 93eca5b..0000000
--- a/test/Instrumentation/AddressSanitizer/do-not-instrument-llvm-metadata.ll
+++ /dev/null
@@ -1,15 +0,0 @@
-; This test checks that we are not instrumenting globals in llvm.metadata
-; and other llvm internal globals.
-; RUN: opt < %s -asan -asan-module -S | FileCheck %s
-
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-unknown-linux-gnu"
-
-@.str_noinst = private unnamed_addr constant [4 x i8] c"aaa\00", section "llvm.metadata"
-@.str_noinst_prof = private unnamed_addr constant [4 x i8] c"aaa\00", section "__llvm_prf_data"
-@.str_inst = private unnamed_addr constant [4 x i8] c"aaa\00"
-
-; CHECK-NOT: {{asan_gen.*str_noinst}}
-; CHECK-NOT: {{asan_gen.*str_noinst_prof}}
-; CHECK: {{asan_gen.*str_inst}}
-; CHECK: @asan.module_ctor