Changeset 34241 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Nov 22, 2010 2:26:53 PM (14 years ago)

Author:

vboxsync

Message:

PDM: Added search paths to the device and driver DLL CFGM nodes so that VBoxEhciR0.r0/RC.rc can be found.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPLib.cpp (modified) (3 diffs)
• testcase/tstSupLoadModule.cpp (modified) (1 diff)

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

@@ -1556 +1556 @@
 
 
-SUPR3DECL(int) SUPR3LoadModule(const char *pszFilename, const char *pszModule, void **ppvImageBase)
-{
-    int rc = VINF_SUCCESS;
-#ifdef VBOX_WITH_HARDENING
+SUPR3DECL(int) SUPR3LoadModule(const char *pszFilename, const char *pszModule, void **ppvImageBase, char *pszErr, size_t cbErr)
+{
     /*
      * Check that the module can be trusted.
      */
-    rc = supR3HardenedVerifyFixedFile(pszFilename, false /* fFatal */);
-#endif
+    int rc = SUPR3HardenedVerifyPlugIn(pszFilename, pszErr, cbErr);
     if (RT_SUCCESS(rc))
+    {
         rc = supLoadModule(pszFilename, pszModule, NULL, ppvImageBase);
-    else
-        LogRel(("SUPR3LoadModule: Verification of \"%s\" failed, rc=%Rrc\n", rc));
+        if (RT_FAILURE(rc))
+            RTStrPrintf(pszErr, cbErr, "supLoadModule returned %Rrc", rc);
+    }
     return rc;
 }
@@ -2056 +2055 @@
 {
     void *pvImageBase;
-    return SUPR3LoadModule(pszFilename, "VMMR0.r0", &pvImageBase);
+    return SUPR3LoadModule(pszFilename, "VMMR0.r0", &pvImageBase, NULL, 0);
 }
 
@@ -2189 +2188 @@
 
     LogFlow(("SUPR3HardenedLdrLoadAppPriv: returns %Rrc\n", rc));
+    return rc;
+}
+
+
+SUPR3DECL(int) SUPR3HardenedLdrLoadPlugIn(const char *pszFilename, PRTLDRMOD phLdrMod, char *pszErr, size_t cbErr)
+{
+    int rc;
+
+    /*
+     * Validate input.
+     */
+    AssertPtr(pszErr);
+    Assert(cbErr > 32);
+    AssertPtrReturn(phLdrMod, VERR_INVALID_PARAMETER);
+    *phLdrMod = NIL_RTLDRMOD;
+    AssertPtrReturn(pszFilename, VERR_INVALID_PARAMETER);
+    AssertReturn(RTPathStartsWithRoot(pszFilename), VERR_INVALID_PARAMETER);
+
+#ifdef VBOX_WITH_HARDENING
+    /*
+     * Verify the image file.
+     */
+    rc = supR3HardenedVerifyFile(pszFilename, RTHCUINTPTR_MAX, pszErr, cbErr);
+    if (RT_FAILURE(rc))
+    {
+        if (!pszErr || !cbErr)
+            LogRel(("supR3HardenedVerifyFile: Verification of \"%s\" failed, rc=%Rrc\n", pszFilename, rc));
+        return rc;
+    }
+#endif
+
+    /*
+     * Try load it.
+     */
+    rc = RTLdrLoad(pszFilename, phLdrMod);
+    if (RT_FAILURE(rc))
+        RTStrPrintf(pszErr, cbErr, "RTLdrLoad returned %Rrc", rc);
     return rc;
 }

trunk/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp

@@ -70 +70 @@
             case VINF_GETOPT_NOT_OPTION:
             {
+                char szErr[4096+1024];
                 void *pvImageBase;
-                rc = SUPR3LoadModule(ValueUnion.psz, RTPathFilename(ValueUnion.psz), &pvImageBase);
+                rc = SUPR3LoadModule(ValueUnion.psz, RTPathFilename(ValueUnion.psz), &pvImageBase, szErr, sizeof(szErr));
                 if (RT_FAILURE(rc))
                 {
-                    RTMsgError("%Rrc when attempting to load '%s'\n", rc, ValueUnion.psz);
+                    RTMsgError("%Rrc when attempting to load '%s': %s\n", rc, ValueUnion.psz, szErr);
                     return 1;
                 }