Changeset 35188 in vbox for trunk/src/VBox/VMM

Timestamp:

Dec 16, 2010 3:13:07 PM (14 years ago)

Author:

vboxsync

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

69027

Message:

Use RTERRINFO in SUPLib for hardening APIs and such.

File:

• trunk/src/VBox/VMM/PDMLdr.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/PDMLdr.cpp

@@ -295 +295 @@
          * Load the loader item.
          */
-        char szErr[4096+1024];
-        rc = SUPR3HardenedLdrLoadPlugIn(pModule->szFilename, &pModule->hLdrMod, szErr, sizeof(szErr));
+        RTERRINFOSTATIC ErrInfo;
+        RTErrInfoInitStatic(&ErrInfo);
+        rc = SUPR3HardenedLdrLoadPlugIn(pModule->szFilename, &pModule->hLdrMod, &ErrInfo.Core);
         if (RT_SUCCESS(rc))
         {
@@ -306 +307 @@
             /* Something went wrong, most likely module not found. Don't consider other unlikely errors */
             rc = VMSetError(pUVM->pVM, rc, RT_SRC_POS,
-                            N_("Unable to load R3 module %s (%s): %s"), pModule->szFilename, pszName, szErr);
+                            N_("Unable to load R3 module %s (%s): %s"), pModule->szFilename, pszName, ErrInfo.Core.pszMsg);
             RTMemFree(pModule);
         }
@@ -483 +484 @@
      * Open the loader item.
      */
-    char szErr[4096+1024];
-    int rc = SUPR3HardenedVerifyPlugIn(pszFilename, szErr, sizeof(szErr));
+    RTERRINFOSTATIC ErrInfo;
+    RTErrInfoInitStatic(&ErrInfo);
+    int rc = SUPR3HardenedVerifyPlugIn(pszFilename, &ErrInfo.Core);
     if (RT_SUCCESS(rc))
     {
-        szErr[0] = '\0';
+        RTErrInfoClear(&ErrInfo.Core);
         rc = RTLdrOpen(pszFilename, 0, RTLDRARCH_X86_32, &pModule->hLdrMod);
     }
@@ -565 +567 @@
 
     /* Don't consider VERR_PDM_MODULE_NAME_CLASH and VERR_NO_MEMORY above as these are very unlikely. */
-    if (RT_FAILURE(rc) && szErr[0])
-        rc = VMSetError(pVM, rc, RT_SRC_POS, N_("Cannot load RC module %s: %s"), pszFilename, szErr);
+    if (RT_FAILURE(rc) && RTErrInfoIsSet(&ErrInfo.Core))
+        rc = VMSetError(pVM, rc, RT_SRC_POS, N_("Cannot load RC module %s: %s"), pszFilename, ErrInfo.Core.pszMsg);
     else if (RT_FAILURE(rc))
         rc = VMSetError(pVM, rc, RT_SRC_POS, N_("Cannot load RC module %s"), pszFilename);
@@ -633 +635 @@
      * Ask the support library to load it.
      */
-    char szErr[4096+1024];
-    void *pvImageBase;
-    int rc = SUPR3LoadModule(pszFilename, pszName, &pvImageBase, szErr, sizeof(szErr));
+    void           *pvImageBase;
+    RTERRINFOSTATIC ErrInfo;
+    RTErrInfoInitStatic(&ErrInfo);
+    int rc = SUPR3LoadModule(pszFilename, pszName, &pvImageBase, &ErrInfo.Core);
     if (RT_SUCCESS(rc))
     {
@@ -662 +665 @@
     RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
     RTMemFree(pModule);
-    LogRel(("pdmR3LoadR0U: pszName=\"%s\" rc=%Rrc szErr=\"%s\"\n", pszName, rc, szErr));
+    LogRel(("pdmR3LoadR0U: pszName=\"%s\" rc=%Rrc szErr=\"%s\"\n", pszName, rc, ErrInfo.Core.pszMsg));
 
     /* Don't consider VERR_PDM_MODULE_NAME_CLASH and VERR_NO_MEMORY above as these are very unlikely. */
     if (RT_FAILURE(rc) && pUVM->pVM) /** @todo VMR3SetErrorU. */
-        rc = VMSetError(pUVM->pVM, rc, RT_SRC_POS, N_("Cannot load R0 module %s: %s"), pszFilename, szErr);
+        rc = VMSetError(pUVM->pVM, rc, RT_SRC_POS, N_("Cannot load R0 module %s: %s"), pszFilename, ErrInfo.Core.pszMsg);
 
     RTMemTmpFree(pszFile); /* might be reference thru pszFilename in the above VMSetError call. */