Changeset 75049 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Oct 24, 2018 4:06:42 PM (6 years ago)

Author:

vboxsync

Message:

IPRT,SUPDrv: Added cbImage parameter to FNRTLDRRDRMEMDTOR; sketched the basics for darwin module verification. bugref:9232

File:

• trunk/src/VBox/Runtime/common/ldr/ldrMemory.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/ldr/ldrMemory.cpp

@@ -80 +80 @@
  *      Default destructor - pvUser points to the image memory block}
  */
-static DECLCALLBACK(void) rtldrRdrMemDefaultDtor(void *pvUser)
-{
+static DECLCALLBACK(void) rtldrRdrMemDefaultDtor(void *pvUser, size_t cbImage)
+{
+    RT_NOREF(cbImage);
     RTMemFree(pvUser);
 }
@@ -202 +203 @@
 {
     PRTLDRRDRMEM pThis = (PRTLDRRDRMEM)pReader;
-    pThis->pfnDtor(pThis->pvUser);
+    pThis->pfnDtor(pThis->pvUser, pThis->cbImage);
+    pThis->pfnDtor = NULL;
+    pThis->pvUser = NULL;
     RTMemFree(pThis);
     return VINF_SUCCESS;
@@ -279 +282 @@
     /* The rest of the validations will call the destructor. */
     AssertMsgReturnStmt(!(fFlags & ~RTLDR_O_VALID_MASK), ("%#x\n", fFlags),
-                        pfnDtor(pvUser), VERR_INVALID_PARAMETER);
+                        pfnDtor(pvUser, cbImage), VERR_INVALID_PARAMETER);
     AssertMsgReturnStmt(enmArch > RTLDRARCH_INVALID && enmArch < RTLDRARCH_END, ("%d\n", enmArch),
-                        pfnDtor(pvUser), VERR_INVALID_PARAMETER);
+                        pfnDtor(pvUser, cbImage), VERR_INVALID_PARAMETER);
     if (!pfnRead)
         pfnRead = rtldrRdrMemDefaultReader;
     else
-        AssertReturnStmt(RT_VALID_PTR(pfnRead), pfnDtor(pvUser), VERR_INVALID_POINTER);
-    AssertReturnStmt(cbImage > 0, pfnDtor(pvUser), VERR_INVALID_PARAMETER);
+        AssertReturnStmt(RT_VALID_PTR(pfnRead), pfnDtor(pvUser, cbImage), VERR_INVALID_POINTER);
+    AssertReturnStmt(cbImage > 0, pfnDtor(pvUser, cbImage), VERR_INVALID_PARAMETER);
 
     /*
@@ -312 +315 @@
     else
     {
-        pfnDtor(pvUser);
+        pfnDtor(pvUser, cbImage);
         rc = RTErrInfoSetF(pErrInfo, rc, "rtldrRdrMem_Create failed: %Rrc", rc);
     }