[compiler-rt] r347933 - Revert r346560 "[winasan] Unpoison the stack in NtTerminateThread"

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Thu Nov 29 15:57:17 2018
New Revision: 347933

URL: http://llvm.org/viewvc/llvm-project?rev=347933&view=rev
Log:
Revert r346560 "[winasan] Unpoison the stack in NtTerminateThread"

This reverts r343606 again. The NtTerminateThread interceptor is causing
problems in NaCl:
https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/CrWinAsan/1839

I reproduced the problem locally and tried my best to debug them, but
it's beyond me.

Modified:
    compiler-rt/trunk/lib/asan/asan_win.cc
    compiler-rt/trunk/test/asan/TestCases/Windows/dll_host.cc

Modified: compiler-rt/trunk/lib/asan/asan_win.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_win.cc?rev=347933&r1=347932&r2=347933&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_win.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_win.cc Thu Nov 29 15:57:17 2018
@@ -154,14 +154,6 @@ INTERCEPTOR_WINAPI(DWORD, CreateThread,
                             asan_thread_start, t, thr_flags, tid);
 }
 
-INTERCEPTOR_WINAPI(LONG, NtTerminateThread, HANDLE handle, LONG status) {
-  // Unpoison the terminating thread's stack because the memory may be re-used.
-  NT_TIB *tib = (NT_TIB *)NtCurrentTeb();
-  uptr stackSize = (uptr)tib->StackBase - (uptr)tib->StackLimit;
-  __asan_unpoison_memory_region(tib->StackLimit, stackSize);
-  return REAL(NtTerminateThread(handle, status));
-}
-
 // }}}
 
 namespace __asan {
@@ -177,9 +169,7 @@ void InitializePlatformInterceptors() {
 
   ASAN_INTERCEPT_FUNC(CreateThread);
   ASAN_INTERCEPT_FUNC(SetUnhandledExceptionFilter);
-  CHECK(::__interception::OverrideFunction("NtTerminateThread",
-                                           (uptr)WRAP(NtTerminateThread),
-                                           (uptr *)&REAL(NtTerminateThread)));
+
 #ifdef _WIN64
   ASAN_INTERCEPT_FUNC(__C_specific_handler);
 #else

Modified: compiler-rt/trunk/test/asan/TestCases/Windows/dll_host.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Windows/dll_host.cc?rev=347933&r1=347932&r2=347933&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Windows/dll_host.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Windows/dll_host.cc Thu Nov 29 15:57:17 2018
@@ -29,7 +29,6 @@
 // IMPORT: __asan_wrap_HeapReAlloc
 // IMPORT: __asan_wrap_HeapSize
 // IMPORT: __asan_wrap_CreateThread
-// IMPORT: __asan_wrap_NtTerminateThread
 // IMPORT: __asan_wrap_RaiseException
 // IMPORT: __asan_wrap_RtlRaiseException
 // IMPORT: __asan_wrap_SetUnhandledExceptionFilter