Changeset 2936 in kBuild for trunk/src/kWorker

Timestamp:

Sep 18, 2016 8:47:59 PM (8 years ago)

Author:

bird

Message:

kWorker: Intercept TlsAlloc and TlsFree too, same reason as for the FlsAlloc/Free.

File:

• trunk/src/kWorker/kWorker.c (modified) (4 diffs)

trunk/src/kWorker/kWorker.c

@@ -7036 +7036 @@
  * Thread/Fiber local storage leak prevention.
  *
- * Note! The FlsAlloc/Free causes problems for statically linked VS2010
- *       code like VBoxBs3ObjConverter.exe.  One thing is that we're
- *       leaking these indexes, but more importantely we crash during
+ * Note! The FlsAlloc/Free & TlsAlloc/Free causes problems for statically
+ *       linked VS2010 code like VBoxBs3ObjConverter.exe.  One thing is that
+ *       we're leaking these indexes, but more importantely we crash during
  *       worker exit since the callback is triggered multiple times.
  */
@@ -7092 +7092 @@
             {
                 pTracker->idx   = FLS_OUT_OF_INDEXES;
+                pTracker->pNext = NULL;
+                kHlpFree(pTracker);
+            }
+        }
+    }
+    return fRc;
+}
+
+
+/** Kernel32 - TlsAlloc  */
+DWORD WINAPI kwSandbox_Kernel32_TlsAlloc(VOID)
+{
+    DWORD idxTls = TlsAlloc();
+    KW_LOG(("TlsAlloc() -> %#x\n", idxTls));
+    if (idxTls != TLS_OUT_OF_INDEXES)
+    {
+        PKWLOCALSTORAGE pTracker = (PKWLOCALSTORAGE)kHlpAlloc(sizeof(*pTracker));
+        if (pTracker)
+        {
+            kHlpAssert(GetCurrentThreadId() == g_Sandbox.idMainThread);
+            pTracker->idx = idxTls;
+            pTracker->pNext = g_Sandbox.pTlsAllocHead;
+            g_Sandbox.pTlsAllocHead = pTracker;
+        }
+    }
+
+    return idxTls;
+}
+
+/** Kernel32 - TlsFree */
+BOOL WINAPI kwSandbox_Kernel32_TlsFree(DWORD idxTls)
+{
+    BOOL fRc = TlsFree(idxTls);
+    KW_LOG(("TlsFree(%#x) -> %d\n", idxTls, fRc));
+    if (fRc)
+    {
+        PKWLOCALSTORAGE pTracker;
+        kHlpAssert(GetCurrentThreadId() == g_Sandbox.idMainThread);
+
+        pTracker = g_Sandbox.pTlsAllocHead;
+        if (pTracker)
+        {
+            if (pTracker->idx == idxTls)
+                g_Sandbox.pTlsAllocHead = pTracker->pNext;
+            else
+            {
+                PKWLOCALSTORAGE pPrev;
+                do
+                {
+                    pPrev = pTracker;
+                    pTracker = pTracker->pNext;
+                } while (pTracker && pTracker->idx != idxTls);
+                if (pTracker)
+                    pPrev->pNext = pTracker->pNext;
+            }
+            if (pTracker)
+            {
+                pTracker->idx   = TLS_OUT_OF_INDEXES;
                 pTracker->pNext = NULL;
                 kHlpFree(pTracker);
@@ -7599 +7657 @@
     { TUPLE("FlsAlloc"),                    NULL,       (KUPTR)kwSandbox_Kernel32_FlsAlloc },
     { TUPLE("FlsFree"),                     NULL,       (KUPTR)kwSandbox_Kernel32_FlsFree },
+    { TUPLE("TlsAlloc"),                    NULL,       (KUPTR)kwSandbox_Kernel32_TlsAlloc },
+    { TUPLE("TlsFree"),                     NULL,       (KUPTR)kwSandbox_Kernel32_TlsFree },
 
     { TUPLE("SetConsoleCtrlHandler"),       NULL,       (KUPTR)kwSandbox_Kernel32_SetConsoleCtrlHandler },
@@ -7755 +7815 @@
     { TUPLE("FlsAlloc"),                    NULL,       (KUPTR)kwSandbox_Kernel32_FlsAlloc },
     { TUPLE("FlsFree"),                     NULL,       (KUPTR)kwSandbox_Kernel32_FlsFree },
+    { TUPLE("TlsAlloc"),                    NULL,       (KUPTR)kwSandbox_Kernel32_TlsAlloc },
+    { TUPLE("TlsFree"),                     NULL,       (KUPTR)kwSandbox_Kernel32_TlsFree },
 };
 /** Number of entries in g_aSandboxGetProcReplacements. */