Changeset 2924 for trunk/src/kWorker/kWorker.c

Timestamp:

Sep 15, 2016, 10:51:38 PM (9 years ago)

Author:

bird

Message:

GetProcAddress replacements.

File:

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

trunk/src/kWorker/kWorker.c

@@ -785 +785 @@
 extern KWREPLACEMENTFUNCTION const g_aSandboxNativeReplacements[];
 extern KU32                  const g_cSandboxNativeReplacements;
+
+extern KWREPLACEMENTFUNCTION const g_aSandboxGetProcReplacements[];
+extern KU32                  const g_cSandboxGetProcReplacements;
+
 
 /** Create a larget BSS blob that with help of /IMAGEBASE:0x10000 should
@@ -4088 +4092 @@
         if (rc == 0)
         {
-            static int s_cDbgGets = 0;
-            s_cDbgGets++;
-            KW_LOG(("GetProcAddress(%s, %s) -> %p [%d]\n", pMod->pszPath, pszProc, (KUPTR)uValue, s_cDbgGets));
+            //static int s_cDbgGets = 0;
+            KU32 cchProc = kHlpStrLen(pszProc);
+            KU32 i = g_cSandboxGetProcReplacements;
+            while (i-- > 0)
+                if (   g_aSandboxGetProcReplacements[i].cchFunction == cchProc
+                    && kHlpMemComp(g_aSandboxGetProcReplacements[i].pszFunction, pszProc, cchProc) == 0)
+                {
+                    if (   !g_aSandboxGetProcReplacements[i].pszModule
+                        || kHlpStrICompAscii(g_aSandboxGetProcReplacements[i].pszModule, &pMod->pszPath[pMod->offFilename]) == 0)
+                    {
+                        if (   pMod->fExe
+                            || !g_aSandboxGetProcReplacements[i].fOnlyExe)
+                        {
+                            uValue = g_aSandboxGetProcReplacements[i].pfnReplacement;
+                            KW_LOG(("GetProcAddress(%s, %s) -> %p replaced\n", pMod->pszPath, pszProc, (KUPTR)uValue));
+                        }
+                        kwLdrModuleRelease(pMod);
+                        return (FARPROC)(KUPTR)uValue;
+                    }
+                }
+
+            KW_LOG(("GetProcAddress(%s, %s) -> %p\n", pMod->pszPath, pszProc, (KUPTR)uValue));
             kwLdrModuleRelease(pMod);
+            //s_cDbgGets++;
             //if (s_cGets >= 3)
             //    return (FARPROC)kwSandbox_BreakIntoDebugger;
@@ -7530 +7554 @@
 
 /**
+ * Functions that needs replacing when queried by GetProcAddress.
+ */
+KWREPLACEMENTFUNCTION const g_aSandboxGetProcReplacements[] =
+{
+    /*
+     * Kernel32.dll and friends.
+     */
+    { TUPLE("FlsAlloc"),                    NULL,       (KUPTR)kwSandbox_Kernel32_FlsAlloc },
+    { TUPLE("FlsFree"),                     NULL,       (KUPTR)kwSandbox_Kernel32_FlsFree },
+};
+/** Number of entries in g_aSandboxGetProcReplacements. */
+KU32 const                  g_cSandboxGetProcReplacements = K_ELEMENTS(g_aSandboxGetProcReplacements);
+
+
+/**
  * Control handler.
  *
@@ -8307 +8346 @@
     int rcExit;
     PKWTOOL pTool;
+
+    KW_LOG(("\n\nkSubmitHandleJobUnpacked: '%s' in '%s' cArgs=%u cEnvVars=%u cPostCmdArgs=%u\n",
+            pszExecutable, pszCwd, cArgs, cEnvVars, cPostCmdArgs));
+#ifdef KW_LOG_ENABLED
+    {
+        KU32 i;
+        for (i = 0; i < cArgs; i++)
+            KW_LOG(("  papszArgs[%u]=%s\n", i, papszArgs[i]));
+        for (i = 0; i < cPostCmdArgs; i++)
+            KW_LOG(("  papszPostCmdArgs[%u]=%s\n", i, papszPostCmdArgs[i]));
+    }
+#endif
 
     /*