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

Timestamp:

Jul 30, 2020 9:06:35 AM (5 years ago)

Author:

vboxsync

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

139611

Message:

reverted r139610

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.cpp (modified) (3 diffs)
• SUPDrvInternal.h (modified) (1 diff)
• SUPLibLdr.cpp (modified) (2 diffs)

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

@@ -5255 +5255 @@
                                           pImage->paSegments[iSeg].fProt);
             }
-        if (iSeg >= pImage->cSegments)
-        {
-            supdrvLdrUnlock(pDevExt);
-            return supdrvLdrLoadError(VERR_INVALID_PARAMETER, pReq,
-                                      "Bad entry point %p given for %s: no matching segment found (RVA %#zx)!",
-                                      pv, pszSymbol, uRva);
-        }
 
         if (pImage->fNative)
@@ -5342 +5335 @@
     }
 
-    /*
-     * Copy the segments before we start using supdrvLdrValidatePointer for entrypoint validation.
-     */
-    pImage->cSegments = pReq->u.In.cSegments;
-    {
-        size_t  cbSegments = pImage->cSegments * sizeof(SUPLDRSEG);
-        pImage->paSegments = (PSUPLDRSEG)RTMemDup(&pReq->u.In.abImage[pReq->u.In.offSegments], cbSegments);
-        if (pImage->paSegments) /* Align the last segment size to avoid upsetting RTR0MemObjProtect. */ /** @todo relax RTR0MemObjProtect */
-            pImage->paSegments[pImage->cSegments - 1].cb = RT_ALIGN_32(pImage->paSegments[pImage->cSegments - 1].cb, PAGE_SIZE);
-        else
-        {
-            supdrvLdrUnlock(pDevExt);
-            return supdrvLdrLoadError(VERR_NO_MEMORY, pReq, "Out of memory for segment table: %#x", cbSegments);
-        }
-        SUPDRV_CHECK_SMAP_CHECK(pDevExt, RT_NOTHING);
-    }
-
-    /*
-     * Validate entrypoints.
-     */
     switch (pReq->u.In.eEPType)
     {
@@ -5431 +5404 @@
             if (!pImage->paSymbols)
                 rc = supdrvLdrLoadError(VERR_NO_MEMORY, pReq, "Out of memory for symbol table: %#x", cbSymbols);
+            SUPDRV_CHECK_SMAP_CHECK(pDevExt, RT_NOTHING);
+        }
+
+        pImage->cSegments = pReq->u.In.cSegments;
+        if (RT_SUCCESS(rc))
+        {
+            size_t  cbSegments = pImage->cSegments * sizeof(SUPLDRSEG);
+            pImage->paSegments = (PSUPLDRSEG)RTMemDup(&pReq->u.In.abImage[pReq->u.In.offSegments], cbSegments);
+            if (pImage->paSegments) /* Align the last segment size to avoid upsetting RTR0MemObjProtect. */ /** @todo relax RTR0MemObjProtect */
+                pImage->paSegments[pImage->cSegments - 1].cb = RT_ALIGN_32(pImage->paSegments[pImage->cSegments - 1].cb, PAGE_SIZE);
+            else
+                rc = supdrvLdrLoadError(VERR_NO_MEMORY, pReq, "Out of memory for segment table: %#x", cbSegments);
             SUPDRV_CHECK_SMAP_CHECK(pDevExt, RT_NOTHING);
         }

trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h

@@ -146 +146 @@
 #endif
 
-#if defined(RT_OS_LINUX) /** @todo make everyone do this */
+#if 0 /*defined(RT_OS_LINUX)*/ /** @todo make everyone do this */
 /** Use the RTR0MemObj API rather than the RTMemExecAlloc for the images.
  * This is a good idea in general, but a necessity for @bugref{9801}. */

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

@@ -359 +359 @@
     RT_NOREF(hLdrMod);
 
-    Log2(("supLoadModuleCompileSegmentsCB: %RTptr/%RTptr LB %RTptr/%RTptr prot %#x %s\n",
-          pSeg->LinkAddress, pSeg->RVA, pSeg->cbMapped, pSeg->cb, pSeg->fProt, pSeg->pszName));
-
     /* Ignore segments not part of the loaded image. */
     if (pSeg->RVA == NIL_RTLDRADDR || pSeg->cbMapped == 0)
-    {
-        Log2(("supLoadModuleCompileSegmentsCB: -> skipped\n"));
         return VINF_SUCCESS;
-    }
 
     /* We currently ASSUME that all relevant segments are in ascending RVA order. */
@@ -380 +374 @@
     AssertReturn(pSeg->RVA      < _1G, VERR_INTERNAL_ERROR_3);
     uint32_t uRvaSeg  = (uint32_t)pSeg->RVA;
+    Log2(("supLoadModuleCompileSegmentsCB: %RTptr/%RTptr LB %RTptr/%RTptr prot %#x %s\n",
+          pSeg->LinkAddress, pSeg->RVA, pSeg->cbMapped, pSeg->cb, pSeg->fProt, pSeg->pszName));
 
     /*