Changeset 43303 in vbox for trunk/src/VBox/Runtime/r0drv/darwin

Timestamp:

Sep 11, 2012 11:55:10 PM (13 years ago)

Author:

vboxsync

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

80723

Message:

Forward ported r78414 from 4.1: Fix VERR_NO_MEMORY loading VMMR0.r0 because of mt.lion executable memory fixes.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox/Runtime/r0drv/darwin/dbgkrnlinfo-r0drv-darwin.cpp (modified) (4 diffs)
• src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp (modified) (2 diffs)
• src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/darwin/dbgkrnlinfo-r0drv-darwin.cpp

@@ -395 +395 @@
 extern "C" void OSMalloc(void);
 extern "C" void OSlibkernInit(void);
-extern "C" int  osrelease;
-extern "C" int  ostype;
 extern "C" void kdp_set_interface(void);
 
@@ -743 +741 @@
                     RETURN_VERR_BAD_EXE_FORMAT;
 
-                if (pSeg->vmaddr != 0)
+                if (   pSeg->vmaddr != 0
+                    || !strcmp(pSeg->segname, "__PAGEZERO"))
                 {
                     if (pSeg->vmaddr + RT_ALIGN_Z(pSeg->vmsize, RT_BIT_32(12)) < pSeg->vmaddr)
@@ -775 +774 @@
                         case S_MOD_TERM_FUNC_POINTERS:
                         case S_COALESCED:
+                        case S_4BYTE_LITERALS:
                             if (  pSeg->filesize != 0
                                 ? paSects[i].offset - pSeg->fileoff >= pSeg->filesize
@@ -792 +792 @@
                         case S_SYMBOL_STUBS:
                         case S_INTERPOSING:
-                        case S_4BYTE_LITERALS:
                         case S_8BYTE_LITERALS:
                         case S_16BYTE_LITERALS:

trunk/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp

@@ -547 +547 @@
                         RTThreadPreemptRestore(&State);
 # endif
+
+                        /* Bug 6226: Ignore KERN_PROTECTION_FAILURE on Leopard and older. */
+                        if (   rc == VERR_PERMISSION_DENIED
+                            && version_major <= 9 /* 9 = 10.5.x = Leopard. */)
+                            rc = VINF_SUCCESS;
                     }
                     else
@@ -1034 +1039 @@
                                    fMachProt);
     if (krc != KERN_SUCCESS)
+    {
+        static int s_cComplaints = 0;
+        if (s_cComplaints < 10)
+        {
+            s_cComplaints++;
+            printf("rtR0MemObjNativeProtect: vm_protect(%p,%p,%p,false,%#x) -> %d\n",
+                   pVmMap, (void *)Start, (void *)cbSub, fMachProt, krc);
+
+            kern_return_t               krc2;
+            vm_offset_t                 pvReal = Start;
+            vm_size_t                   cbReal = 0;
+            mach_msg_type_number_t      cInfo  = VM_REGION_BASIC_INFO_COUNT;
+            struct vm_region_basic_info Info;
+            RT_ZERO(Info);
+            krc2 = vm_region(pVmMap, &pvReal, &cbReal, VM_REGION_BASIC_INFO, (vm_region_info_t)&Info, &cInfo, NULL);
+            printf("rtR0MemObjNativeProtect: basic info - krc2=%d pv=%p cb=%p prot=%#x max=%#x inh=%#x shr=%d rvd=%d off=%#x behavior=%#x wired=%#x\n",
+                   krc2, (void *)pvReal, (void *)cbReal, Info.protection, Info.max_protection,  Info.inheritance,
+                   Info.shared, Info.reserved, Info.offset, Info.behavior, Info.user_wired_count);
+        }
         return RTErrConvertFromDarwinKern(krc);
+    }
 
     /*

trunk/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h

@@ -60 +60 @@
 #include <libkern/libkern.h>
 #include <libkern/sysctl.h>
+#include <libkern/version.h>
 #include <mach/thread_act.h>
 #include <mach/vm_map.h>
+#include <mach/vm_region.h>
 #include <pexpert/pexpert.h>
 #include <sys/conf.h>
@@ -142 +144 @@
 /* osfmk/vm/vm_user.c */
 extern kern_return_t vm_protect(vm_map_t, vm_offset_t, vm_size_t, boolean_t, vm_prot_t);
+/*extern kern_return_t vm_region(vm_map_t, vm_address_t *, vm_size_t *, vm_region_flavor_t, vm_region_info_t,
+                               mach_msg_type_number_t *, mach_port_t *);*/
 
 /* i386/machine_routines.h */