Changeset 85339 in vbox

Timestamp:

Jul 14, 2020 1:29:53 PM (4 years ago)

Author:

vboxsync

Message:

iprt/formats/mach-o.h,ldrMachO.cpp: New segment flag SG_READ_ONLY added in 10.14. Harmless. bugref:9790

Location:

trunk

Files:

• include/iprt/formats/mach-o.h (modified) (1 diff)
• src/VBox/Runtime/common/ldr/ldrMachO.cpp (modified) (2 diffs)

trunk/include/iprt/formats/mach-o.h

@@ -365 +365 @@
 #define SG_NORELOC          UINT32_C(0x00000004)
 #define SG_PROTECTED_VERSION_1 UINT32_C(0x00000008)
+#define SG_READ_ONLY        UINT32_C(0x00000010) /**< Make it read-only after applying fixups. @since 10.14 */
 
 /* maxprot/initprot */

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

@@ -102 +102 @@
 #endif
 
+/** @def RTLDRMODMACHO_CHECK_MSG_RETURN
+ * Checks that an expression is true and return if it isn't.
+ * This is a debug aid.
+ */
+#ifdef RTLDRMODMACHO_STRICT2
+# define RTLDRMODMACHO_CHECK_MSG_RETURN(expr, msgargs, rc)  AssertMsgReturn(expr, msgargs, rc)
+#else
+# define RTLDRMODMACHO_CHECK_MSG_RETURN(expr, msgargs, rc)  do { if (RT_LIKELY(expr)) {/* likely */ } else return (rc); } while (0)
+#endif
+
 /** @def RTLDRMODMACHO_CHECK_RETURN
  * Checks that an expression is true and return if it isn't.
@@ -710 +720 @@
                 RTLDRMODMACHO_CHECK_RETURN(!(~pSrcSeg->maxprot & pSrcSeg->initprot), \
                                           VERR_LDRMACHO_BAD_LOAD_COMMAND); \
-                RTLDRMODMACHO_CHECK_RETURN(!(pSrcSeg->flags & ~(SG_HIGHVM | SG_FVMLIB | SG_NORELOC | SG_PROTECTED_VERSION_1)), \
-                                          VERR_LDRMACHO_BAD_LOAD_COMMAND); \
+                RTLDRMODMACHO_CHECK_MSG_RETURN(!(pSrcSeg->flags & ~(SG_HIGHVM | SG_FVMLIB | SG_NORELOC | SG_PROTECTED_VERSION_1 | SG_READ_ONLY)), \
+                                               ("flags=%#x %s\n", pSrcSeg->flags, pSrcSeg->segname), \
+                                               VERR_LDRMACHO_BAD_LOAD_COMMAND); \
                 RTLDRMODMACHO_CHECK_RETURN(   pSrcSeg->nsects * sizeof(section_##a_cBits##_t) \
                                           <= u.pLoadCmd->cmdsize - sizeof(segment_command_##a_cBits##_t), \