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

Timestamp:

Oct 24, 2018 7:08:56 PM (6 years ago)

Author:

vboxsync

Message:

IPRT,SUPDrv: Made the verification code link, fixed a couple of assertions. Seems to work for VMMR0 now. bugref:9232

Location:

trunk/src/VBox/Runtime/common/ldr

Files:

• ldrEx.cpp (modified) (2 diffs)
• ldrMachO.cpp (modified) (2 diffs)
• ldrMemory.cpp (modified) (1 diff)

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

@@ -45 +45 @@
 #include "internal/ldr.h"
 
-#ifdef LDR_ONLY_PE
+#if defined(LDR_ONLY_PE) || defined(LDR_ONLY_MACHO)
 # undef LDR_WITH_PE
 # undef LDR_WITH_ELF
@@ -54 +54 @@
 # undef LDR_WITH_MZ
 # undef LDR_WITH_AOUT
-# define LDR_WITH_PE
+# ifdef LDR_ONLY_PE
+#  define LDR_WITH_PE
+# endif
+# ifdef LDR_ONLY_MACHO
+#  define LDR_WITH_MACHO
+# endif
 #endif
 

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

@@ -782 +782 @@
                     case S_MOD_INIT_FUNC_POINTERS: \
                         /** @todo this requires a query API or flag... (e.g. C++ constructors) */ \
-                        RTLDRMODMACHO_CHECK_RETURN(fOpenFlags & RTLDR_O_FOR_DEBUG, \
+                        RTLDRMODMACHO_CHECK_RETURN(fOpenFlags & (RTLDR_O_FOR_DEBUG | RTLDR_O_FOR_VALIDATION), \
                                                   VERR_LDRMACHO_UNSUPPORTED_INIT_SECTION); \
                         RT_FALL_THRU(); \
                     case S_MOD_TERM_FUNC_POINTERS: \
                         /** @todo this requires a query API or flag... (e.g. C++ destructors) */ \
-                        RTLDRMODMACHO_CHECK_RETURN(fOpenFlags & RTLDR_O_FOR_DEBUG, \
+                        RTLDRMODMACHO_CHECK_RETURN(fOpenFlags & (RTLDR_O_FOR_DEBUG | RTLDR_O_FOR_VALIDATION), \
                                                   VERR_LDRMACHO_UNSUPPORTED_TERM_SECTION); \
                         RTLDRMODMACHO_CHECK_RETURN(!pSect->reserved1, VERR_LDRMACHO_BAD_SECTION); \
@@ -1199 +1199 @@
             case LC_MAIN: /** @todo parse this and find and entry point or smth. */
                 /** @todo valid command size. */
-                if (!(fOpenFlags & RTLDR_O_FOR_DEBUG))
+                if (!(fOpenFlags & (RTLDR_O_FOR_DEBUG | RTLDR_O_FOR_VALIDATION)))
                     RTLDRMODMACHO_FAILED_RETURN(RTErrInfoSetF(pErrInfo, VERR_LDRMACHO_UNSUPPORTED_LOAD_COMMAND,
                                                              "cmd=%#x", u.pLoadCmd->cmd));

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

@@ -278 +278 @@
         pfnDtor = rtldrRdrMemDefaultDtor;
     else
-        AssertPtrReturn(pfnRead, VERR_INVALID_POINTER);
+        AssertPtrReturn(pfnDtor, VERR_INVALID_POINTER);
 
     /* The rest of the validations will call the destructor. */