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

Timestamp:

Dec 10, 2010 3:17:31 PM (14 years ago)

Author:

vboxsync

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

68779

Message:

Added RTLdrLoadEx for exposing dlerror info.

File:

• trunk/src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (5 diffs)

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

@@ -2083 +2083 @@
  * @param   pszFilename     The full file name.
  * @param   phLdrMod        Where to store the handle to the loaded module.
+ * @param   pszError        Where to return the loader error. Optional.
+ * @param   cbError         The size of the buffer pointed to by @a pszError.
  */
-static int supR3HardenedLdrLoadIt(const char *pszFilename, PRTLDRMOD phLdrMod)
+static int supR3HardenedLdrLoadIt(const char *pszFilename, PRTLDRMOD phLdrMod, char *pszError, size_t cbError)
 {
 #ifdef VBOX_WITH_HARDENING
@@ -2101 +2103 @@
      * Try load it.
      */
-    return RTLdrLoad(pszFilename, phLdrMod);
-}
-
-
-SUPR3DECL(int) SUPR3HardenedLdrLoad(const char *pszFilename, PRTLDRMOD phLdrMod)
+    return RTLdrLoadEx(pszFilename, phLdrMod, pszError, cbError);
+}
+
+
+SUPR3DECL(int) SUPR3HardenedLdrLoad(const char *pszFilename, PRTLDRMOD phLdrMod, char *pszError, size_t cbError)
 {
     /*
      * Validate input.
      */
-    AssertPtrReturn(pszFilename, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(phLdrMod, VERR_INVALID_PARAMETER);
+    if (!pszError)
+        AssertReturn(!cbError, VERR_INVALID_PARAMETER);
+    else
+    {
+        AssertPtrReturn(pszError, VERR_INVALID_POINTER);
+        if (cbError)
+            *pszError = '\0';
+        else
+            pszError = NULL;
+    }
+    AssertPtrReturn(pszFilename, VERR_INVALID_POINTER);
+    AssertPtrReturn(phLdrMod, VERR_INVALID_POINTER);
     *phLdrMod = NIL_RTLDRMOD;
     AssertReturn(RTPathHavePath(pszFilename), VERR_INVALID_PARAMETER);
@@ -2133 +2145 @@
      * Pass it on to the common library loader.
      */
-    return supR3HardenedLdrLoadIt(pszFilename, phLdrMod);
-}
-
-
-SUPR3DECL(int) SUPR3HardenedLdrLoadAppPriv(const char *pszFilename, PRTLDRMOD phLdrMod)
-{
-    LogFlow(("SUPR3HardenedLdrLoadAppPriv: pszFilename=%p:{%s} phLdrMod=%p\n", pszFilename, pszFilename, phLdrMod));
+    return supR3HardenedLdrLoadIt(pszFilename, phLdrMod, pszError, cbError);
+}
+
+
+SUPR3DECL(int) SUPR3HardenedLdrLoadAppPriv(const char *pszFilename, PRTLDRMOD phLdrMod, char *pszError, size_t cbError)
+{
+    LogFlow(("SUPR3HardenedLdrLoadAppPriv: pszFilename=%p:{%s} phLdrMod=%p pszError=%p cbError=%zu\n", pszFilename, pszFilename, phLdrMod, pszError, cbError));
 
     /*
      * Validate input.
      */
+    if (!pszError)
+        AssertReturn(!cbError, VERR_INVALID_PARAMETER);
+    else
+    {
+        AssertPtrReturn(pszError, VERR_INVALID_POINTER);
+        if (cbError)
+            *pszError = '\0';
+        else
+            pszError = NULL;
+    }
     AssertPtrReturn(phLdrMod, VERR_INVALID_PARAMETER);
     *phLdrMod = NIL_RTLDRMOD;
@@ -2185 +2207 @@
      * Pass it on to SUPR3HardenedLdrLoad.
      */
-    rc = SUPR3HardenedLdrLoad(szPath, phLdrMod);
+    rc = SUPR3HardenedLdrLoad(szPath, phLdrMod, pszError, cbError);
 
     LogFlow(("SUPR3HardenedLdrLoadAppPriv: returns %Rrc\n", rc));
@@ -2222 +2244 @@
      * Try load it.
      */
-    rc = RTLdrLoad(pszFilename, phLdrMod);
-    if (RT_FAILURE(rc))
-        RTStrPrintf(pszErr, cbErr, "RTLdrLoad returned %Rrc", rc);
-    return rc;
+    return RTLdrLoadEx(pszFilename, phLdrMod, pszErr, cbErr);
 }