Changeset 46108 in vbox

Timestamp:

May 15, 2013 7:22:38 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

85796

Message:

Got the NT4 ntfs.sys case working. Turned out to be some memory saving strategy applied to some images during early (?) loading.

Location:

trunk/src/VBox

Files:

• Debugger/DBGPlugInWinNt.cpp (modified) (8 diffs)
• Runtime/common/dbg/dbgcfg.cpp (modified) (6 diffs)
• Runtime/common/dbg/dbgmod.cpp (modified) (1 diff)
• Runtime/common/dbg/dbgmoddbghelp.cpp (modified) (2 diffs)
• Runtime/common/ldr/ldrPE.cpp (modified) (1 diff)
• Runtime/common/string/strcache.cpp (modified) (1 diff)

trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp

@@ -327 +327 @@
                 return rc;
 
-            /* Patch it? */
+            /* Apply SizeOfImage patch? */
             if (   pThis->offSizeOfImage != UINT32_MAX
                 && offFile            < pThis->offSizeOfImage + 4
@@ -333 +333 @@
             {
                 uint32_t SizeOfImage = pThis->cbCorrectImageSize;
+                uint32_t cbPatch     = sizeof(SizeOfImage);
                 int32_t  offPatch    = pThis->offSizeOfImage - offFile;
                 uint8_t *pbPatch     = (uint8_t *)pvBuf + offPatch;
-                uint32_t cbPatch     = sizeof(uint32_t);
                 if (offFile + cbToRead < pThis->offSizeOfImage + cbPatch)
                     cbPatch = offFile + cbToRead - pThis->offSizeOfImage;
@@ -397 +397 @@
  * @param   paShs               Pointer to the section headers.
  * @param   cShs                Number of headers.
- * @param   cbImage             The image size.
- */
-static bool dbgDiggerWinNtIsSectionHeaderOk(PCIMAGE_SECTION_HEADER paShs, uint32_t cShs, uint32_t cbImage)
-{
+ * @param   cbImage             The image size reported by NT.
+ * @param   uRvaRsrc            The RVA of the resource directory. UINT32_MAX if
+ *                              no resource directory.
+ * @param   cbSectAlign         The section alignment specified in the header.
+ * @param   pcbImageCorrect     The corrected image size.  This is derived from
+ *                              cbImage and virtual range of the section tables.
+ *
+ *                              The problem is that NT may choose to drop the
+ *                              last pages in images it loads early, starting at
+ *                              the resource directory.  These images will have
+ *                              a page aligned cbImage.
+ */
+static bool dbgDiggerWinNtCheckSectHdrsAndImgSize(PCIMAGE_SECTION_HEADER paShs, uint32_t cShs, uint32_t cbImage,
+                                                  uint32_t uRvaRsrc, uint32_t cbSectAlign, uint32_t *pcbImageCorrect)
+{
+    *pcbImageCorrect = cbImage;
+
     for (uint32_t i = 0; i < cShs; i++)
     {
@@ -411 +424 @@
         if (paShs[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)
             continue;
-        if (paShs[i].VirtualAddress >= cbImage)
-        {
-            Log(("DigWinNt: Section header #%u has a virtual address beyond the image: %#x cbImage=%#x\n",
-                 i, paShs[i].VirtualAddress, cbImage));
+
+        /* Check that sizes are within the same range and that both sizes and
+           addresses are within reasonable limits. */
+        if (   RT_ALIGN(paShs[i].Misc.VirtualSize, _64K) > RT_ALIGN(paShs[i].SizeOfRawData, _64K)
+            || paShs[i].Misc.VirtualSize >= _1G
+            || paShs[i].SizeOfRawData    >= _1G)
+        {
+            Log(("DigWinNt: Section header #%u has a VirtualSize=%#x and SizeOfRawData=%#x, that's too much data!\n",
+                 i, paShs[i].Misc.VirtualSize, paShs[i].SizeOfRawData));
             return false;
         }
-        if (paShs[i].Misc.VirtualSize >= cbImage) /* we don't check too strictly here becuase NT4 SP1 ntfs.sys. */
-        {
-            Log(("DigWinNt: Section header #%u has a end beyond the image: VirtualAddress=%#x VirtualSize=%#x cbImage=%#x\n",
-                 i, paShs[i].VirtualAddress, paShs[i].Misc.VirtualSize, cbImage));
+        uint32_t uRvaEnd = paShs[i].VirtualAddress + paShs[i].Misc.VirtualSize;
+        if (uRvaEnd >= _1G || uRvaEnd < paShs[i].VirtualAddress)
+        {
+            Log(("DigWinNt: Section header #%u has a VirtualSize=%#x and VirtualAddr=%#x, %#x in total, that's too much!\n",
+                 i, paShs[i].Misc.VirtualSize, paShs[i].VirtualAddress, uRvaEnd));
             return false;
         }
-    }
+
+        /* Check for images chopped off around '.rsrc'. */
+        if (    cbImage < uRvaEnd
+            &&  uRvaEnd >= uRvaRsrc)
+            cbImage = RT_ALIGN(uRvaEnd, cbSectAlign);
+
+        /* Check that the section is within the image. */
+        if (uRvaEnd > cbImage)
+        {
+            Log(("DigWinNt: Section header #%u has a virtual address range beyond the image: %#x TO %#x cbImage=%#x\n",
+                 i, paShs[i].VirtualAddress, uRvaEnd, cbImage));
+            return false;
+        }
+    }
+
+    Assert(*pcbImageCorrect == cbImage || !(*pcbImageCorrect & 0xfff));
+    *pcbImageCorrect = cbImage;
     return true;
 }
@@ -455 +490 @@
      * image if it's in the buffer (it should be).
      */
+    uint32_t uRvaRsrc = UINT32_MAX;
+    if (WINNT_UNION(pThis, pHdrs, OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE]).Size > 0)
+        uRvaRsrc = WINNT_UNION(pThis, pHdrs, OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE]).VirtualAddress;
     uint32_t offShs = offHdrs
                     + (  pThis->f32Bit
@@ -462 +500 @@
     PCIMAGE_SECTION_HEADER paShs = (PCIMAGE_SECTION_HEADER)(pbBuf + offShs);
     if (   offShs + cbShs <= RT_MIN(cbImage, cbBuf)
-        && dbgDiggerWinNtIsSectionHeaderOk(paShs, cShs, cbImage))
+        && dbgDiggerWinNtCheckSectHdrsAndImgSize(paShs, cShs, cbImage, uRvaRsrc,
+                                                 WINNT_UNION(pThis, pHdrs, OptionalHeader.SectionAlignment),
+                                                 &pRdr->cbCorrectImageSize))
     {
         pRdr->cMappings = 0;
@@ -514 +554 @@
     }
 
+    /* Enable the SizeOfImage patching if necessary. */
+    if (pRdr->cbCorrectImageSize != cbImage)
+    {
+        Log(("DigWinNT: The image is really %#x bytes long, not %#x as mapped by NT!\n", pRdr->cbCorrectImageSize, cbImage));
+        pRdr->offSizeOfImage = pThis->f32Bit
+                             ? offHdrs + RT_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader.SizeOfImage)
+                             : offHdrs + RT_OFFSETOF(IMAGE_NT_HEADERS64, OptionalHeader.SizeOfImage);
+    }
+
     /*
      * Call the loader to open the PE image for debugging.
@@ -629 +678 @@
         return;
     }
-
 
     /*

trunk/src/VBox/Runtime/common/dbg/dbgcfg.cpp

@@ -864 +864 @@
                 memcpy(pszPath, pchCache, cchCache);
                 pszPath[cchCache] = '\0';
+                RTPathChangeToUnixSlashes(pszPath, false);
+
                 rcCache = rc2 = rtDbgCfgTryOpenCache(pThis, pszPath, pszCacheSubDir, pSplitFn, fFlags,
                                                      pfnCallback, pvUser1, pvUser2);
@@ -875 +877 @@
                 memcpy(pszPath, pchCache, cchCache);
                 pszPath[cchCache] = '\0';
+                RTPathChangeToUnixSlashes(pszPath, false);
+
                 rc2 = rtDbgCfgTryDownloadAndOpen(pThis, pszServer, pszPath, pszCacheSubDir, pSplitFn, fFlags,
                                                  pfnCallback, pvUser1, pvUser2);
@@ -895 +899 @@
             memcpy(pszPath, pchCache, cchCache);
             pszPath[cchCache] = '\0';
+            RTPathChangeToUnixSlashes(pszPath, false);
+
             rcCache = rc2 = rtDbgCfgTryOpenCache(pThis, pszPath, pszCacheSubDir, pSplitFn, fFlags,
                                                  pfnCallback, pvUser1, pvUser2);
@@ -923 +929 @@
             memcpy(pszPath, pszDir, cchDir);
             pszPath[cchDir] = '\0';
+            RTPathChangeToUnixSlashes(pszPath, false);
 
             rc2 = rtDbgCfgTryOpenDir(pThis, pszPath, pSplitFn, fFlagsDir, pfnCallback, pvUser1, pvUser2);
@@ -1004 +1011 @@
         rc2 = RTPathSplitReassemble(pSplitFn, RTPATH_STR_F_STYLE_HOST, szPath, sizeof(szPath));
         if (RT_SUCCESS(rc2) && RTFileExists(szPath))
+        {
+            RTPathChangeToUnixSlashes(szPath, false);
+            rtDbgCfgLog1(pThis, "Trying '%s'...\n", szPath);
             rc2 = pfnCallback(pThis, pszFilename, pvUser1, pvUser2);
+            if (rc2 == VINF_CALLBACK_RETURN)
+                rtDbgCfgLog1(pThis, "Found '%s'.\n", szPath);
+            else if (rc2 == VERR_CALLBACK_RETURN)
+                rtDbgCfgLog1(pThis, "Error opening '%s'.\n", szPath);
+            else
+                rtDbgCfgLog1(pThis, "Error %Rrc opening '%s'.\n", rc2, szPath);
+        }
     }
     if (   rc2 != VINF_CALLBACK_RETURN
@@ -1016 +1033 @@
         if (RT_FAILURE(rc2))
             strcpy(szPath, ".");
+        RTPathChangeToUnixSlashes(szPath, false);
+
         rc2 = rtDbgCfgTryOpenDir(pThis, szPath, pSplitFn, fFlags, pfnCallback, pvUser1, pvUser2);
         if (RT_FAILURE(rc2) && RT_SUCCESS_NP(rcRet))

trunk/src/VBox/Runtime/common/dbg/dbgmod.cpp

@@ -971 +971 @@
     if (RT_SUCCESS(rc))
     {
-        pDbgMod->pszName = RTStrCacheEnter(g_hDbgModStrCache, pszName);
+        pDbgMod->pszName = RTStrCacheEnterLower(g_hDbgModStrCache, pszName);
         if (pDbgMod->pszName)
         {

trunk/src/VBox/Runtime/common/dbg/dbgmoddbghelp.cpp

@@ -213 +213 @@
 {
     RTDBGMODBGHELPARGS *pArgs  = (RTDBGMODBGHELPARGS *)pvUser;
+
+    if (pLineInfo->Address < pArgs->uModAddr)
+    {
+        Log((" %#018x %05u  %s  [SKIPPED - INVALID ADDRESS!]\n", pLineInfo->Address, pLineInfo->LineNumber));
+        return TRUE;
+    }
 
     /*
@@ -304 +310 @@
 {
     RTDBGMODBGHELPARGS *pArgs = (RTDBGMODBGHELPARGS *)pvUser;
+    if (pSymInfo->Address < pArgs->uModAddr) /* NT4 SP1 ntfs.dbg */
+    {
+        Log(("  %#018x LB %#07x  %s  [SKIPPED - INVALID ADDRESS!]\n", pSymInfo->Address, cbSymbol, pSymInfo->Name));
+        return TRUE;
+    }
 
     int rc = RTDbgModSymbolAdd(pArgs->hCnt, pSymInfo->Name, RTDBGSEGIDX_RVA,

trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

@@ -1730 +1730 @@
             return VERR_BAD_EXE_FORMAT;
         }
-        if (    pDir->Size > cb - pDir->VirtualAddress
-            && !(fFlags & RTLDR_O_FOR_DEBUG) /* NT4 SP1 ntfs.sys base relocs. */ )
+        if (pDir->Size > cb - pDir->VirtualAddress)
         {
             Log(("rtldrPEOpen: %s: dir no. %d Size=%#x is invalid (rva=%#x, limit=%#x)!!!\n",

trunk/src/VBox/Runtime/common/string/strcache.cpp

@@ -174 +174 @@
 
     char *pszRet = (char *)RTMemPoolDupEx((RTMEMPOOL)hStrCache, pchString, cchString, 1);
-    if (!pszRet)
+    if (pszRet)
         RTStrToLower(pszRet);
     return pszRet;