tsan: fix out-of-bounds access in Go runtime

FuncEntry can resize the shadow stack, while "thr->shadow_stack_pos[0] = pc" writes out-of-bounds.

llvm-svn: 210349

diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl.cc b/compiler-rt/lib/tsan/rtl/tsan_rtl.cc
index fe959715f1cc53475a8962c5157f6bd1e5dd9f54..add6bd76947108980e905cf5c2ae1b51bbec75e0 100644 (file)
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_rtl.cc
@@ -423,13 +423,11 @@ void ForkChildAfter(ThreadState *thr, uptr pc) {
 u32 CurrentStackId(ThreadState *thr, uptr pc) {
   if (thr->shadow_stack_pos == 0)  // May happen during bootstrap.
     return 0;
-  if (pc) {
-    thr->shadow_stack_pos[0] = pc;
-    thr->shadow_stack_pos++;
-  }
+  if (pc != 0)
+    FuncEntry(thr, pc);  // can resize the shadow stack
   u32 id = StackDepotPut(thr->shadow_stack,
                          thr->shadow_stack_pos - thr->shadow_stack);
-  if (pc)
+  if (pc != 0)
     thr->shadow_stack_pos--;
   return id;
 }