Changeset 56798 in vbox

Timestamp:

Jul 3, 2015 6:23:57 PM (10 years ago)

Author:

vboxsync

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

101448

Message:

SUPLibLdr.cpp: Better error reporting on missing VMMR0.r0 symbol.

File:

• trunk/src/VBox/HostDrivers/Support/SUPLibLdr.cpp (modified) (11 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLibLdr.cpp

@@ -96 +96 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static int supLoadModule(const char *pszFilename, const char *pszModule, const char *pszSrvReqHandler, void **ppvImageBase);
-static DECLCALLBACK(int) supLoadModuleResolveImport(RTLDRMOD hLdrMod, const char *pszModule, const char *pszSymbol, unsigned uSymbol, RTUINTPTR *pValue, void *pvUser);
+static int               supLoadModule(const char *pszFilename, const char *pszModule, const char *pszSrvReqHandler,
+                                       PRTERRINFO pErrInfo, void **ppvImageBase);
+static DECLCALLBACK(int) supLoadModuleResolveImport(RTLDRMOD hLdrMod, const char *pszModule, const char *pszSymbol,
+                                                    unsigned uSymbol, RTUINTPTR *pValue, void *pvUser);
 
 
@@ -108 +110 @@
     if (RT_SUCCESS(rc))
     {
-        rc = supLoadModule(pszFilename, pszModule, NULL, ppvImageBase);
+        rc = supLoadModule(pszFilename, pszModule, NULL, pErrInfo, ppvImageBase);
         if (RT_FAILURE(rc))
             RTErrInfoSetF(pErrInfo, rc, "SUPR3LoadModule: supLoadModule returned %Rrc", rc);
@@ -126 +128 @@
     int rc = SUPR3HardenedVerifyPlugIn(pszFilename, NULL /*pErrInfo*/);
     if (RT_SUCCESS(rc))
-        rc = supLoadModule(pszFilename, pszModule, pszSrvReqHandler, ppvImageBase);
+        rc = supLoadModule(pszFilename, pszModule, pszSrvReqHandler, NULL /*pErrInfo*/, ppvImageBase);
     else
         LogRel(("SUPR3LoadServiceModule: Verification of \"%s\" failed, rc=%Rrc\n", rc));
@@ -132 +134 @@
 }
 
+
+/**
+ * Argument package for supLoadModuleResolveImport.
+ */
+typedef struct SUPLDRRESIMPARGS
+{
+    const char *pszModule;
+    PRTERRINFO  pErrInfo;
+} SUPLDRRESIMPARGS, *PSUPLDRRESIMPARGS;
 
 /**
@@ -147 +158 @@
                                                     const char *pszSymbol, unsigned uSymbol, RTUINTPTR *pValue, void *pvUser)
 {
-    NOREF(hLdrMod); NOREF(pvUser); NOREF(uSymbol);
+    NOREF(hLdrMod); NOREF(uSymbol);
     AssertPtr(pValue);
     AssertPtr(pvUser);
+    PSUPLDRRESIMPARGS pArgs = (PSUPLDRRESIMPARGS)pvUser;
 
     /*
@@ -159 +171 @@
         &&  strcmp(pszModule, "VMMR0.r0"))
     {
-        AssertMsgFailed(("%s is importing from %s! (expected 'SUPR0.dll' or 'VMMR0.r0', case-sensitive)\n", pvUser, pszModule));
-        return VERR_SYMBOL_NOT_FOUND;
+        AssertMsgFailed(("%s is importing from %s! (expected 'SUPR0.dll' or 'VMMR0.r0', case-sensitive)\n", pArgs->pszModule, pszModule));
+        return RTErrInfoSetF(pArgs->pErrInfo, VERR_SYMBOL_NOT_FOUND,
+                             "Unexpected import module '%s' in '%s'", pszModule, pArgs->pszModule);
     }
 
@@ -166 +179 @@
      * No ordinals.
      */
-    if (pszSymbol < (const char*)0x10000)
-    {
-        AssertMsgFailed(("%s is importing by ordinal (ord=%d)\n", pvUser, (int)(uintptr_t)pszSymbol));
-        return VERR_SYMBOL_NOT_FOUND;
+    if (uSymbol != ~0U)
+    {
+        AssertMsgFailed(("%s is importing by ordinal (ord=%d)\n", pArgs->pszModule, uSymbol));
+        return RTErrInfoSetF(pArgs->pErrInfo, VERR_SYMBOL_NOT_FOUND,
+                             "Unexpected ordinal import (%#x) in '%s'", uSymbol, pArgs->pszModule);
     }
 
@@ -254 +268 @@
         pFunc++;
     }
-
-    AssertLogRelMsgFailed(("%s is importing %s which we couldn't find\n", pvUser, pszSymbol));
+    RTAssertMsg2Weak("%s is importing %s which we couldn't find\n", pArgs->pszModule, pszSymbol);
+
+    AssertLogRelMsgFailed(("%s is importing %s which we couldn't find\n", pArgs->pszModule, pszSymbol));
     if (g_uSupFakeMode)
     {
@@ -261 +276 @@
         return VINF_SUCCESS;
     }
-    return VERR_SYMBOL_NOT_FOUND;
+    return RTErrInfoSetF(pArgs->pErrInfo, VERR_SYMBOL_NOT_FOUND,
+                         "Unable to local imported symbol '%s%s%s' for module '%s'",
+                         pszModule ? pszModule : "",
+                         pszModule && *pszModule ? "." : "",
+                         pArgs->pszModule);
 }
 
@@ -331 +350 @@
  * @param   pszFilename     Name of the VMMR0 image file
  */
-static int supLoadModule(const char *pszFilename, const char *pszModule, const char *pszSrvReqHandler, void **ppvImageBase)
+static int supLoadModule(const char *pszFilename, const char *pszModule, const char *pszSrvReqHandler,
+                         PRTERRINFO pErrInfo, void **ppvImageBase)
 {
     int rc;
@@ -413 +433 @@
                  * Get the image bits.
                  */
+
+                SUPLDRRESIMPARGS Args = { pszModule, pErrInfo };
                 rc = RTLdrGetBits(hLdrMod, &pLoadReq->u.In.abImage[0], (uintptr_t)OpenReq.u.Out.pvImageBase,
-                                  supLoadModuleResolveImport, (void *)pszModule);
+                                  supLoadModuleResolveImport, &Args);
 
                 if (RT_SUCCESS(rc))