]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/kern/kern_mman.c
xnu-4570.31.3.tar.gz
[apple/xnu.git] / bsd / kern / kern_mman.c
index 13a64cb93a78aaae1f30b9ebb8d77f7e82c1a443..adb144567dbe2afe3242d67b95d84fda95369364 100644 (file)
 #include <sys/ubc.h>
 #include <sys/ubc_internal.h>
 #include <sys/sysproto.h>
-#if CONFIG_PROTECT
-#include <sys/cprotect.h>
-#endif
 
 #include <sys/syscall.h>
 #include <sys/kdebug.h>
+#include <sys/bsdtask_info.h>
 
 #include <security/audit/audit.h>
 #include <bsm/audit_kevents.h>
 #include <mach/mach_vm.h>
 #include <mach/vm_map.h>
 #include <mach/host_priv.h>
+#include <mach/sdt.h>
 
 #include <machine/machine_routines.h>
 
 #include <kern/cpu_number.h>
 #include <kern/host.h>
 #include <kern/task.h>
+#include <kern/page_decrypt.h>
+
+#include <IOKit/IOReturn.h>
 
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_pager.h>
 #include <vm/vm_protos.h>
 
-/* XXX the following function should probably be static */
-kern_return_t map_fd_funneled(int, vm_object_offset_t, vm_offset_t *,
-                               boolean_t, vm_size_t);
+#if CONFIG_MACF
+#include <security/mac_framework.h>
+#endif
 
 /*
  * XXX Internally, we use VM_PROT_* somewhat interchangeably, but the correct
@@ -142,7 +144,7 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
         *      Map in special device (must be SHARED) or file
         */
        struct fileproc *fp;
-       register struct         vnode *vp;
+       struct                  vnode *vp;
        int                     flags;
        int                     prot;
        int                     err=0;
@@ -152,7 +154,9 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
        vm_map_size_t           user_size;
        vm_object_offset_t      pageoff;
        vm_object_offset_t      file_pos;
-       int                     alloc_flags=0;
+       int                     alloc_flags = 0;
+       vm_tag_t                tag = VM_KERN_MEMORY_NONE;
+       vm_map_kernel_flags_t   vmk_flags = VM_MAP_KERNEL_FLAGS_NONE;
        boolean_t               docow;
        vm_prot_t               maxprot;
        void                    *handle;
@@ -164,6 +168,14 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
        int fd = uap->fd;
        int num_retries = 0;
 
+       /*
+        * Note that for UNIX03 conformance, there is additional parameter checking for
+        * mmap() system call in libsyscall prior to entering the kernel.  The sanity 
+        * checks and argument validation done in this function are not the only places
+        * one can get returned errnos.
+        */
+
+       user_map = current_map();
        user_addr = (vm_map_offset_t)uap->addr;
        user_size = (vm_map_size_t) uap->len;
 
@@ -202,17 +214,36 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
         * Align the file position to a page boundary,
         * and save its page offset component.
         */
-       pageoff = (file_pos & PAGE_MASK);
+       pageoff = (file_pos & vm_map_page_mask(user_map));
        file_pos -= (vm_object_offset_t)pageoff;
 
 
        /* Adjust size for rounding (on both ends). */
-       user_size += pageoff;                   /* low end... */
-       user_size = mach_vm_round_page(user_size);      /* hi end */
+       user_size += pageoff;   /* low end... */
+       user_size = vm_map_round_page(user_size,        
+                                     vm_map_page_mask(user_map)); /* hi end */
+
+       if (flags & MAP_JIT) {
+               if ((flags & MAP_FIXED) ||
+                   (flags & MAP_SHARED) ||
+                   !(flags & MAP_ANON) ||
+                   (flags & MAP_RESILIENT_CODESIGN) ||
+                   (flags & MAP_RESILIENT_MEDIA)) {
+                       return EINVAL;
+               }
+       }
 
-       if ((flags & MAP_JIT) && ((flags & MAP_FIXED) || (flags & MAP_SHARED) || !(flags & MAP_ANON))){
-               return EINVAL;
+       if ((flags & MAP_RESILIENT_CODESIGN) ||
+           (flags & MAP_RESILIENT_MEDIA)) {
+               if ((flags & MAP_ANON) ||
+                   (flags & MAP_JIT)) {
+                       return EINVAL;
+               }
+               if (prot & (VM_PROT_WRITE | VM_PROT_EXECUTE)) {
+                       return EPERM;
+               }
        }
+
        /*
         * Check for illegal addresses.  Watch out for address wrap... Note
         * that VM_*_ADDRESS are not constants due to casts (argh).
@@ -224,7 +255,7 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
                 * should be aligned after adjustment by pageoff.
                 */
                user_addr -= pageoff;
-               if (user_addr & PAGE_MASK)
+               if (user_addr & vm_map_page_mask(user_map))
                        return (EINVAL);
        }
 #ifdef notyet
@@ -237,8 +268,10 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
         * There should really be a pmap call to determine a reasonable
         * location.
         */
-       else if (addr < mach_vm_round_page(p->p_vmspace->vm_daddr + MAXDSIZ))
-               addr = mach_vm_round_page(p->p_vmspace->vm_daddr + MAXDSIZ);
+       else if (addr < vm_map_round_page(p->p_vmspace->vm_daddr + MAXDSIZ,
+                                         vm_map_page_mask(user_map)))
+               addr = vm_map_round_page(p->p_vmspace->vm_daddr + MAXDSIZ,
+                                        vm_map_page_mask(user_map));
 
 #endif
 
@@ -266,12 +299,15 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
                         * Use "fd" to pass (some) Mach VM allocation flags,
                         * (see the VM_FLAGS_* definitions).
                         */
-                       alloc_flags = fd & (VM_FLAGS_ALIAS_MASK | VM_FLAGS_SUPERPAGE_MASK |
+                       alloc_flags = fd & (VM_FLAGS_ALIAS_MASK |
+                                           VM_FLAGS_SUPERPAGE_MASK |
                                            VM_FLAGS_PURGABLE);
                        if (alloc_flags != fd) {
                                /* reject if there are any extra flags */
                                return EINVAL;
                        }
+                       VM_GET_FLAGS_ALIAS(alloc_flags, tag);
+                       alloc_flags &= ~VM_FLAGS_ALIAS_MASK;
                }
                        
                handle = NULL;
@@ -292,7 +328,8 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
                if (err)
                        return(err);
                fpref = 1;
-               if(fp->f_fglob->fg_type == DTYPE_PSXSHM) {
+               switch (FILEGLOB_DTYPE(fp->f_fglob)) {
+               case DTYPE_PSXSHM:
                        uap->addr = (user_addr_t)user_addr;
                        uap->len = (user_size_t)user_size;
                        uap->prot = prot;
@@ -300,9 +337,9 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
                        uap->pos = file_pos;
                        error = pshm_mmap(p, uap, retval, fp, (off_t)pageoff);
                        goto bad;
-               }
-
-               if (fp->f_fglob->fg_type != DTYPE_VNODE) {
+               case DTYPE_VNODE:
+                       break;
+               default:
                        error = EINVAL;
                        goto bad;
                }
@@ -399,24 +436,12 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
                        handle = (void *)vp;
 #if CONFIG_MACF
                        error = mac_file_check_mmap(vfs_context_ucred(ctx),
-                           fp->f_fglob, prot, flags, &maxprot);
+                           fp->f_fglob, prot, flags, file_pos, &maxprot);
                        if (error) {
                                (void)vnode_put(vp);
                                goto bad;
                        }
 #endif /* MAC */
-
-#if CONFIG_PROTECT
-                       {
-                               error = cp_handle_vnop(vp, CP_READ_ACCESS | CP_WRITE_ACCESS, 0);
-                               if (error) {
-                                       (void) vnode_put(vp);
-                                       goto bad;
-                               }
-                       }
-#endif /* CONFIG_PROTECT */
-
-
                }
        }
 
@@ -431,22 +456,23 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
         *      We bend a little - round the start and end addresses
         *      to the nearest page boundary.
         */
-       user_size = mach_vm_round_page(user_size);
+       user_size = vm_map_round_page(user_size,
+                                     vm_map_page_mask(user_map));
 
-       if (file_pos & PAGE_MASK_64) {
+       if (file_pos & vm_map_page_mask(user_map)) {
                if (!mapanon)
                        (void)vnode_put(vp);
                error = EINVAL;
                goto bad;
        }
 
-       user_map = current_map();
-
        if ((flags & MAP_FIXED) == 0) {
                alloc_flags |= VM_FLAGS_ANYWHERE;
-               user_addr = mach_vm_round_page(user_addr);
+               user_addr = vm_map_round_page(user_addr,
+                                             vm_map_page_mask(user_map));
        } else {
-               if (user_addr != mach_vm_trunc_page(user_addr)) {
+               if (user_addr != vm_map_trunc_page(user_addr,
+                                                  vm_map_page_mask(user_map))) {
                        if (!mapanon)
                                (void)vnode_put(vp);
                        error = EINVAL;
@@ -469,9 +495,14 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
        if (flags & MAP_NOCACHE)
                alloc_flags |= VM_FLAGS_NO_CACHE;
 
-       if (flags & MAP_JIT){
-               alloc_flags |= VM_FLAGS_MAP_JIT;
+       if (flags & MAP_JIT) {
+               vmk_flags.vmkf_map_jit = TRUE;
+       }
+
+       if (flags & MAP_RESILIENT_CODESIGN) {
+               alloc_flags |= VM_FLAGS_RESILIENT_CODESIGN;
        }
+
        /*
         * Lookup/allocate object.
         */
@@ -496,7 +527,8 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
 map_anon_retry:
                result = vm_map_enter_mem_object(user_map,
                                                 &user_addr, user_size,
-                                                0, alloc_flags,
+                                                0, alloc_flags, vmk_flags,
+                                                tag,
                                                 IPC_PORT_NULL, 0, FALSE,
                                                 prot, maxprot,
                                                 (flags & MAP_SHARED) ?
@@ -509,7 +541,7 @@ map_anon_retry:
                 * lack of space between the address and the map's maximum.
                 */
                if ((result == KERN_NO_SPACE) && ((flags & MAP_FIXED) == 0) && user_addr && (num_retries++ == 0)) {
-                       user_addr = PAGE_SIZE;
+                       user_addr = vm_map_page_size(user_map);
                        goto map_anon_retry;
                }
        } else {
@@ -562,10 +594,23 @@ map_anon_retry:
                if (maxprot & (VM_PROT_EXECUTE | VM_PROT_WRITE))
                        maxprot |= VM_PROT_READ;
 #endif /* radar 3777787 */
+
 map_file_retry:
+               if ((flags & MAP_RESILIENT_CODESIGN) ||
+                   (flags & MAP_RESILIENT_MEDIA)) {
+                       if (prot & (VM_PROT_WRITE | VM_PROT_EXECUTE)) {
+                               assert(!mapanon);
+                               vnode_put(vp);
+                               error = EPERM;
+                               goto bad;
+                       }
+                       /* strictly limit access to "prot" */
+                       maxprot &= prot;
+               }
                result = vm_map_enter_mem_object_control(user_map,
                                                 &user_addr, user_size,
-                                                0, alloc_flags,
+                                                0, alloc_flags, vmk_flags,
+                                                tag,
                                                 control, file_pos,
                                                 docow, prot, maxprot, 
                                                 (flags & MAP_SHARED) ?
@@ -578,7 +623,7 @@ map_file_retry:
                 * lack of space between the address and the map's maximum.
                 */
                if ((result == KERN_NO_SPACE) && ((flags & MAP_FIXED) == 0) && user_addr && (num_retries++ == 0)) {
-                       user_addr = PAGE_SIZE;
+                       user_addr = vm_map_page_size(user_map);
                        goto map_file_retry;
                }
        }
@@ -616,8 +661,10 @@ bad:
                fp_drop(p, fd, fp, 0);
 
        KERNEL_DEBUG_CONSTANT((BSDDBG_CODE(DBG_BSD_SC_EXTENDED_INFO, SYS_mmap) | DBG_FUNC_NONE), fd, (uint32_t)(*retval), (uint32_t)user_size, error, 0);
+#ifndef        CONFIG_EMBEDDED
        KERNEL_DEBUG_CONSTANT((BSDDBG_CODE(DBG_BSD_SC_EXTENDED_INFO2, SYS_mmap) | DBG_FUNC_NONE), (uint32_t)(*retval >> 32), (uint32_t)(user_size >> 32),
                              (uint32_t)(file_pos >> 32), (uint32_t)file_pos, 0);
+#endif
        return(error);
 }
 
@@ -638,10 +685,13 @@ msync_nocancel(__unused proc_t p, struct msync_nocancel_args *uap, __unused int3
        int rv;
        vm_sync_t sync_flags=0;
 
+       user_map = current_map();
        addr = (mach_vm_offset_t) uap->addr;
        size = (mach_vm_size_t)uap->len;
+#ifndef        CONFIG_EMBEDDED
        KERNEL_DEBUG_CONSTANT((BSDDBG_CODE(DBG_BSD_SC_EXTENDED_INFO, SYS_msync) | DBG_FUNC_NONE), (uint32_t)(addr >> 32), (uint32_t)(size >> 32), 0, 0, 0);
-       if (addr & PAGE_MASK_64) {
+#endif
+       if (addr & vm_map_page_mask(user_map)) {
                /* UNIX SPEC: user address is not page-aligned, return EINVAL */
                return EINVAL;
        }
@@ -677,7 +727,6 @@ msync_nocancel(__unused proc_t p, struct msync_nocancel_args *uap, __unused int3
 
        sync_flags |= VM_SYNC_CONTIGUOUS;       /* complain if holes */
 
-       user_map = current_map();
        rv = mach_vm_msync(user_map, addr, size, sync_flags);
 
        switch (rv) {
@@ -698,16 +747,18 @@ int
 munmap(__unused proc_t p, struct munmap_args *uap, __unused int32_t *retval)
 {
        mach_vm_offset_t        user_addr;
-       mach_vm_size_t  user_size;
-       kern_return_t   result;
+       mach_vm_size_t          user_size;
+       kern_return_t           result;
+       vm_map_t                user_map;
 
+       user_map = current_map();
        user_addr = (mach_vm_offset_t) uap->addr;
        user_size = (mach_vm_size_t) uap->len;
 
        AUDIT_ARG(addr, user_addr);
        AUDIT_ARG(len, user_size);
 
-       if (user_addr & PAGE_MASK_64) {
+       if (user_addr & vm_map_page_mask(user_map)) {
                /* UNIX SPEC: user address is not page-aligned, return EINVAL */
                return EINVAL;
        }
@@ -720,7 +771,7 @@ munmap(__unused proc_t p, struct munmap_args *uap, __unused int32_t *retval)
                return EINVAL;
        }
 
-       result = mach_vm_deallocate(current_map(), user_addr, user_size);
+       result = mach_vm_deallocate(user_map, user_addr, user_size);
        if (result != KERN_SUCCESS) {
                return(EINVAL);
        }
@@ -730,7 +781,7 @@ munmap(__unused proc_t p, struct munmap_args *uap, __unused int32_t *retval)
 int
 mprotect(__unused proc_t p, struct mprotect_args *uap, __unused int32_t *retval)
 {
-       register vm_prot_t prot;
+       vm_prot_t prot;
        mach_vm_offset_t        user_addr;
        mach_vm_size_t  user_size;
        kern_return_t   result;
@@ -743,11 +794,12 @@ mprotect(__unused proc_t p, struct mprotect_args *uap, __unused int32_t *retval)
        AUDIT_ARG(len, uap->len);
        AUDIT_ARG(value32, uap->prot);
 
+       user_map = current_map();
        user_addr = (mach_vm_offset_t) uap->addr;
        user_size = (mach_vm_size_t) uap->len;
-       prot = (vm_prot_t)(uap->prot & (VM_PROT_ALL | VM_PROT_TRUSTED));
+       prot = (vm_prot_t)(uap->prot & (VM_PROT_ALL | VM_PROT_TRUSTED | VM_PROT_STRIP_READ));
 
-       if (user_addr & PAGE_MASK_64) {
+       if (user_addr & vm_map_page_mask(user_map)) {
                /* UNIX SPEC: user address is not page-aligned, return EINVAL */
                return EINVAL;
        }
@@ -765,7 +817,10 @@ mprotect(__unused proc_t p, struct mprotect_args *uap, __unused int32_t *retval)
                prot |= VM_PROT_READ;
 #endif /* 3936456 */
 
-       user_map = current_map();
+#if defined(__arm64__)
+       if (prot & VM_PROT_STRIP_READ)
+               prot &= ~(VM_PROT_READ | VM_PROT_STRIP_READ);
+#endif
 
 #if CONFIG_MACF
        /*
@@ -793,9 +848,12 @@ mprotect(__unused proc_t p, struct mprotect_args *uap, __unused int32_t *retval)
                 * mac_proc_check_mprotect() hook above. Otherwise, Codesigning will be
                 * compromised because the check would always succeed and thusly any
                 * process could sign dynamically. */
-               result = vm_map_sign(user_map, 
-                                    vm_map_trunc_page(user_addr), 
-                                    vm_map_round_page(user_addr+user_size));
+               result = vm_map_sign(
+                       user_map, 
+                       vm_map_trunc_page(user_addr,
+                                         vm_map_page_mask(user_map)),
+                       vm_map_round_page(user_addr+user_size,
+                                         vm_map_page_mask(user_map)));
                switch (result) {
                        case KERN_SUCCESS:
                                break;
@@ -831,7 +889,7 @@ minherit(__unused proc_t p, struct minherit_args *uap, __unused int32_t *retval)
 {
        mach_vm_offset_t addr;
        mach_vm_size_t size;
-       register vm_inherit_t inherit;
+       vm_inherit_t inherit;
        vm_map_t        user_map;
        kern_return_t   result;
 
@@ -899,6 +957,13 @@ madvise(__unused proc_t p, struct madvise_args *uap, __unused int32_t *retval)
                case MADV_CAN_REUSE:
                        new_behavior = VM_BEHAVIOR_CAN_REUSE;
                        break;
+               case MADV_PAGEOUT:
+#if MACH_ASSERT
+                       new_behavior = VM_BEHAVIOR_PAGEOUT;
+                       break;
+#else /* MACH_ASSERT */
+                       return ENOTSUP;
+#endif /* MACH_ASSERT */
                default:
                        return(EINVAL);
        }
@@ -906,6 +971,25 @@ madvise(__unused proc_t p, struct madvise_args *uap, __unused int32_t *retval)
        start = (mach_vm_offset_t) uap->addr;
        size = (mach_vm_size_t) uap->len;
        
+#if __arm64__
+       if (start == 0 &&
+           size != 0 &&
+           (uap->behav == MADV_FREE ||
+            uap->behav == MADV_FREE_REUSABLE)) {
+               printf("** FOURK_COMPAT: %d[%s] "
+                      "failing madvise(0x%llx,0x%llx,%s)\n",
+                      p->p_pid, p->p_comm, start, size,
+                      ((uap->behav == MADV_FREE_REUSABLE)
+                       ? "MADV_FREE_REUSABLE"
+                       : "MADV_FREE"));
+               DTRACE_VM3(fourk_compat_madvise,
+                          uint64_t, start,
+                          uint64_t, size,
+                          int, uap->behav);
+               return EINVAL;
+       }
+#endif /* __arm64__ */
+
        user_map = current_map();
 
        result = mach_vm_behavior_set(user_map, start, size, new_behavior);
@@ -924,17 +1008,19 @@ madvise(__unused proc_t p, struct madvise_args *uap, __unused int32_t *retval)
 int
 mincore(__unused proc_t p, struct mincore_args *uap, __unused int32_t *retval)
 {
-       mach_vm_offset_t addr, first_addr, end;
-       vm_map_t map;
-       user_addr_t vec;
-       int error;
-       int vecindex, lastvecindex;
+       mach_vm_offset_t addr = 0, first_addr = 0, end = 0, cur_end = 0;
+       vm_map_t map = VM_MAP_NULL;
+       user_addr_t vec = 0;
+       int error = 0;
+       int vecindex = 0, lastvecindex = 0;
        int mincoreinfo=0;
-       int pqueryinfo;
-       kern_return_t   ret;
-       int numref;
-
-       char c;
+       int pqueryinfo = 0;
+       unsigned int pqueryinfo_vec_size = 0;
+       vm_page_info_basic_t info = NULL;
+       mach_msg_type_number_t count = 0;
+       char *kernel_vec = NULL;
+       int req_vec_size_pages = 0, cur_vec_size_pages = 0;
+       kern_return_t kr = KERN_SUCCESS;
 
        map = current_map();
 
@@ -942,82 +1028,119 @@ mincore(__unused proc_t p, struct mincore_args *uap, __unused int32_t *retval)
         * Make sure that the addresses presented are valid for user
         * mode.
         */
-       first_addr = addr = mach_vm_trunc_page(uap->addr);
-       end = addr + mach_vm_round_page(uap->len);
+       first_addr = addr = vm_map_trunc_page(uap->addr,
+                                             vm_map_page_mask(map));
+       end = vm_map_round_page(uap->addr + uap->len,
+                                      vm_map_page_mask(map));
 
        if (end < addr)
                return (EINVAL);
 
+       if (end == addr)
+               return (0);
+
        /*
-        * Address of byte vector
+        * We are going to loop through the whole 'req_vec_size' pages
+        * range in chunks of 'cur_vec_size'.
         */
-       vec = uap->vec;
 
-       map = current_map();
+       req_vec_size_pages = (end - addr) >> PAGE_SHIFT;
+       cur_vec_size_pages = MIN(req_vec_size_pages, (int)(MAX_PAGE_RANGE_QUERY >> PAGE_SHIFT));
+
+       kernel_vec = (void*) _MALLOC(cur_vec_size_pages * sizeof(char), M_TEMP, M_WAITOK);
+
+       if (kernel_vec == NULL) {
+               return (ENOMEM);
+       }
 
        /*
-        * Do this on a map entry basis so that if the pages are not
-        * in the current processes address space, we can easily look
-        * up the pages elsewhere.
+        * Address of byte vector
         */
-       lastvecindex = -1;
-       for( ; addr < end; addr += PAGE_SIZE ) {
-               pqueryinfo = 0;
-               ret = mach_vm_page_query(map, addr, &pqueryinfo, &numref);
-               if (ret != KERN_SUCCESS) 
-                       pqueryinfo = 0;
-               mincoreinfo = 0;
-               if (pqueryinfo & VM_PAGE_QUERY_PAGE_PRESENT)
-                       mincoreinfo |= MINCORE_INCORE;
-               if (pqueryinfo & VM_PAGE_QUERY_PAGE_REF)
-                       mincoreinfo |= MINCORE_REFERENCED;
-               if (pqueryinfo & VM_PAGE_QUERY_PAGE_DIRTY)
-                       mincoreinfo |= MINCORE_MODIFIED;
-               
-               
-               /*
-                * calculate index into user supplied byte vector
-                */
-               vecindex = (addr - first_addr)>> PAGE_SHIFT;
+       vec = uap->vec;
+
+       pqueryinfo_vec_size = cur_vec_size_pages * sizeof(struct vm_page_info_basic);
+       info = (void*) _MALLOC(pqueryinfo_vec_size, M_TEMP, M_WAITOK);
+
+       if (info == NULL) {
+               FREE(kernel_vec, M_TEMP);
+               return (ENOMEM);
+       }
+
+       while (addr < end) {
+
+               cur_end = addr + (cur_vec_size_pages * PAGE_SIZE_64);
+
+               count =  VM_PAGE_INFO_BASIC_COUNT;
+               kr = vm_map_page_range_info_internal(map,
+                                     addr,
+                                     cur_end,
+                                     VM_PAGE_INFO_BASIC,
+                                     (vm_page_info_t) info,
+                                     &count);
+
+               assert(kr == KERN_SUCCESS);
 
                /*
-                * If we have skipped map entries, we need to make sure that
-                * the byte vector is zeroed for those skipped entries.
+                * Do this on a map entry basis so that if the pages are not
+                * in the current processes address space, we can easily look
+                * up the pages elsewhere.
                 */
-               while((lastvecindex + 1) < vecindex) {
-                       c = 0;
-                       error = copyout(&c, vec + lastvecindex, 1);
-                       if (error) {
-                               return (EFAULT);
-                       }
-                       ++lastvecindex;
+               lastvecindex = -1;
+               for( ; addr < cur_end; addr += PAGE_SIZE ) {
+
+                       pqueryinfo = info[lastvecindex + 1].disposition;
+
+                       mincoreinfo = 0;
+
+                       if (pqueryinfo & VM_PAGE_QUERY_PAGE_PRESENT)
+                               mincoreinfo |= MINCORE_INCORE;
+                       if (pqueryinfo & VM_PAGE_QUERY_PAGE_REF)
+                               mincoreinfo |= MINCORE_REFERENCED;
+                       if (pqueryinfo & VM_PAGE_QUERY_PAGE_DIRTY)
+                               mincoreinfo |= MINCORE_MODIFIED;
+                       if (pqueryinfo & VM_PAGE_QUERY_PAGE_PAGED_OUT)
+                               mincoreinfo |= MINCORE_PAGED_OUT;
+                       if (pqueryinfo & VM_PAGE_QUERY_PAGE_COPIED)
+                               mincoreinfo |= MINCORE_COPIED;
+                       if ((pqueryinfo & VM_PAGE_QUERY_PAGE_EXTERNAL) == 0)
+                               mincoreinfo |= MINCORE_ANONYMOUS;
+                       /*
+                        * calculate index into user supplied byte vector
+                        */
+                       vecindex = (addr - first_addr)>> PAGE_SHIFT;
+                       kernel_vec[vecindex] = (char)mincoreinfo;
+                       lastvecindex = vecindex;
                }
 
-               /*
-                * Pass the page information to the user
-                */
-               c = (char)mincoreinfo;
-               error = copyout(&c, vec + vecindex, 1);
+
+               assert(vecindex == (cur_vec_size_pages - 1));
+
+               error = copyout(kernel_vec, vec, cur_vec_size_pages * sizeof(char) /* a char per page */);
+
                if (error) {
-                       return (EFAULT);
+                       break;
                }
-               lastvecindex = vecindex;
+
+               /*
+                * For the next chunk, we'll need:
+                * - bump the location in the user buffer for our next disposition.
+                * - new length
+                * - starting address
+                */
+               vec += cur_vec_size_pages * sizeof(char);
+               req_vec_size_pages = (end - addr) >> PAGE_SHIFT;
+               cur_vec_size_pages = MIN(req_vec_size_pages, (int)(MAX_PAGE_RANGE_QUERY >> PAGE_SHIFT));
+
+               first_addr = addr;
        }
 
+       FREE(kernel_vec, M_TEMP);
+       FREE(info, M_TEMP);
 
-       /*
-        * Zero the last entries in the byte vector.
-        */
-       vecindex = (end - first_addr) >> PAGE_SHIFT;
-       while((lastvecindex + 1) < vecindex) {
-               c = 0;
-               error = copyout(&c, vec + lastvecindex, 1);
-               if (error) {
-                       return (EFAULT);
-               }
-               ++lastvecindex;
+       if (error) {
+               return (EFAULT);
        }
-       
+
        return (0);
 }
 
@@ -1042,16 +1165,18 @@ mlock(__unused proc_t p, struct mlock_args *uap, __unused int32_t *retvalval)
        if (size == 0)
                return (0);
 
-       pageoff = (addr & PAGE_MASK);
-       addr -= pageoff;
-       size = vm_map_round_page(size+pageoff);
        user_map = current_map();
+       pageoff = (addr & vm_map_page_mask(user_map));
+       addr -= pageoff;
+       size = vm_map_round_page(size+pageoff, vm_map_page_mask(user_map));
 
        /* have to call vm_map_wire directly to pass "I don't know" protections */
-       result = vm_map_wire(user_map, addr, addr+size, VM_PROT_NONE, TRUE);
+       result = vm_map_wire_kernel(user_map, addr, addr+size, VM_PROT_NONE, VM_KERN_MEMORY_MLOCK, TRUE);
 
        if (result == KERN_RESOURCE_SHORTAGE)
                return EAGAIN;
+       else if (result == KERN_PROTECTION_FAILURE)
+               return EACCES;
        else if (result != KERN_SUCCESS)
                return ENOMEM;
 
@@ -1074,7 +1199,7 @@ munlock(__unused proc_t p, struct munlock_args *uap, __unused int32_t *retval)
        user_map = current_map();
 
        /* JMM - need to remove all wirings by spec - this just removes one */
-       result = mach_vm_wire(host_priv_self(), user_map, addr, size, VM_PROT_NONE);
+       result = mach_vm_wire_kernel(host_priv_self(), user_map, addr, size, VM_PROT_NONE, VM_KERN_MEMORY_MLOCK);
        return (result == KERN_SUCCESS ? 0 : ENOMEM);
 }
 
@@ -1091,206 +1216,136 @@ munlockall(__unused proc_t p, __unused struct munlockall_args *uap, __unused int
        return(ENOSYS);
 }
 
-#if            !defined(CONFIG_EMBEDDED)
-/* USV: No! need to obsolete map_fd()! mmap() already supports 64 bits */
-kern_return_t
-map_fd(struct map_fd_args *args)
-{
-       int             fd = args->fd;
-       vm_offset_t     offset = args->offset;
-       vm_offset_t     *va = args->va;
-       boolean_t       findspace = args->findspace;
-       vm_size_t       size = args->size;
-       kern_return_t ret;
-
-       AUDIT_MACH_SYSCALL_ENTER(AUE_MAPFD);
-       AUDIT_ARG(addr, CAST_DOWN(user_addr_t, args->va));
-       AUDIT_ARG(fd, fd);
-
-       ret = map_fd_funneled( fd, (vm_object_offset_t)offset, va, findspace, size);
-
-       AUDIT_MACH_SYSCALL_EXIT(ret);
-       return ret;
-}
-
-kern_return_t
-map_fd_funneled(
-       int                     fd,
-       vm_object_offset_t      offset,
-       vm_offset_t             *va,
-       boolean_t               findspace,
-       vm_size_t               size)
+#if CONFIG_CODE_DECRYPTION
+int
+mremap_encrypted(__unused struct proc *p, struct mremap_encrypted_args *uap, __unused int32_t *retval)
 {
-       kern_return_t   result;
-       struct fileproc *fp;
-       struct vnode    *vp;
-       void *  pager;
-       vm_offset_t     map_addr=0;
-       vm_size_t       map_size;
-       int             err=0;
-       vm_prot_t       maxprot = VM_PROT_ALL;
-       vm_map_t        my_map;
-       proc_t          p = current_proc();
-       struct vnode_attr vattr;
-
-       /*
-        *      Find the inode; verify that it's a regular file.
-        */
-
-       err = fp_lookup(p, fd, &fp, 0);
-       if (err)
-               return(err);
-       
-       if (fp->f_fglob->fg_type != DTYPE_VNODE){
-               err = KERN_INVALID_ARGUMENT;
-               goto bad;
-       }
-
-       if (!(fp->f_fglob->fg_flag & FREAD)) {
-               err = KERN_PROTECTION_FAILURE;
-               goto bad;
-       }
-
-       vp = (struct vnode *)fp->f_fglob->fg_data;
-       err = vnode_getwithref(vp);
-       if(err != 0) 
-               goto bad;
-
-       if (vp->v_type != VREG) {
-               (void)vnode_put(vp);
-               err = KERN_INVALID_ARGUMENT;
-               goto bad;
-       }
-
-#if CONFIG_MACF
-       err = mac_file_check_mmap(vfs_context_ucred(vfs_context_current()),
-                       fp->f_fglob, VM_PROT_DEFAULT, MAP_FILE, &maxprot);
-       if (err) {
-               (void)vnode_put(vp);
-               goto bad;
-       }
-#endif /* MAC */
-
-#if CONFIG_PROTECT
-       /* check for content protection access */
-       {
-               err = cp_handle_vnop(vp, CP_READ_ACCESS | CP_WRITE_ACCESS, 0);
-               if (err != 0) { 
-                       (void) vnode_put(vp);
-                       goto bad;
-               }
-       }
-#endif /* CONFIG_PROTECT */
-
-       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
-
-       /*
-        * POSIX: mmap needs to update access time for mapped files
-        */
-       if ((vnode_vfsvisflags(vp) & MNT_NOATIME) == 0) {
-               VATTR_INIT(&vattr);
-               nanotime(&vattr.va_access_time);
-               VATTR_SET_ACTIVE(&vattr, va_access_time);
-               vnode_setattr(vp, &vattr, vfs_context_current());
-       }
-       
-       if (offset & PAGE_MASK_64) {
-               printf("map_fd: file offset not page aligned(%d : %s)\n",p->p_pid, p->p_comm);
-               (void)vnode_put(vp);
-               err = KERN_INVALID_ARGUMENT;
-               goto bad;
-       }
-       map_size = round_page(size);
-
-       /*
-        * Allow user to map in a zero length file.
-        */
-       if (size == 0) {
-               (void)vnode_put(vp);
-               err = KERN_SUCCESS;
-               goto bad;
-       }
-       /*
-        *      Map in the file.
-        */
-       pager = (void *)ubc_getpager(vp);
-       if (pager == NULL) {
-               (void)vnode_put(vp);
-               err = KERN_FAILURE;
-               goto bad;
-       }
-
-
-       my_map = current_map();
-
-       result = vm_map_64(
-                       my_map,
-                       &map_addr, map_size, (vm_offset_t)0, 
-                       VM_FLAGS_ANYWHERE, pager, offset, TRUE,
-                       VM_PROT_DEFAULT, maxprot,
-                       VM_INHERIT_DEFAULT);
-       if (result != KERN_SUCCESS) {
-               (void)vnode_put(vp);
-               err = result;
-               goto bad;
-       }
-
-
-       if (!findspace) {
-               //K64todo fix for 64bit user?
-               uint32_t        dst_addr;
-               vm_map_copy_t   tmp;
-
-               if (copyin(CAST_USER_ADDR_T(va), &dst_addr, sizeof (dst_addr))  ||
-                                       trunc_page(dst_addr) != dst_addr) {
-                       (void) vm_map_remove(
-                                       my_map,
-                                       map_addr, map_addr + map_size,
-                                       VM_MAP_NO_FLAGS);
-                       (void)vnode_put(vp);
-                       err = KERN_INVALID_ADDRESS;
-                       goto bad;
-               }
-
-               result = vm_map_copyin(my_map, (vm_map_address_t)map_addr,
-                                      (vm_map_size_t)map_size, TRUE, &tmp);
-               if (result != KERN_SUCCESS) {
-                       
-                       (void) vm_map_remove(my_map, vm_map_trunc_page(map_addr),
-                                       vm_map_round_page(map_addr + map_size),
-                                       VM_MAP_NO_FLAGS);
-                       (void)vnode_put(vp);
-                       err = result;
-                       goto bad;
-               }
-
-               result = vm_map_copy_overwrite(my_map,
-                                       (vm_map_address_t)dst_addr, tmp, FALSE);
-               if (result != KERN_SUCCESS) {
-                       vm_map_copy_discard(tmp);
-                       (void)vnode_put(vp);
-                       err = result;
-                       goto bad;
-               }
-       } else {
-               // K64todo bug compatible now, should fix for 64bit user
-               uint32_t user_map_addr = CAST_DOWN_EXPLICIT(uint32_t, map_addr);
-               if (copyout(&user_map_addr, CAST_USER_ADDR_T(va), sizeof (user_map_addr))) {
-                       (void) vm_map_remove(my_map, vm_map_trunc_page(map_addr),
-                                       vm_map_round_page(map_addr + map_size),
-                                       VM_MAP_NO_FLAGS);
-                       (void)vnode_put(vp);
-                       err = KERN_INVALID_ADDRESS;
-                       goto bad;
-               }
-       }
+    mach_vm_offset_t   user_addr;
+    mach_vm_size_t     user_size;
+    kern_return_t      result;
+    vm_map_t   user_map;
+    uint32_t   cryptid;
+    cpu_type_t cputype;
+    cpu_subtype_t      cpusubtype;
+    pager_crypt_info_t crypt_info;
+    const char * cryptname = 0;
+    char *vpath;
+    int len, ret;
+    struct proc_regioninfo_internal pinfo;
+    vnode_t vp;
+    uintptr_t vnodeaddr;
+    uint32_t vid;
+    
+    AUDIT_ARG(addr, uap->addr);
+    AUDIT_ARG(len, uap->len);
+    
+    user_map = current_map();
+    user_addr = (mach_vm_offset_t) uap->addr;
+    user_size = (mach_vm_size_t) uap->len;
+    
+    cryptid = uap->cryptid;
+    cputype = uap->cputype;
+    cpusubtype = uap->cpusubtype;
+    
+    if (user_addr & vm_map_page_mask(user_map)) {
+        /* UNIX SPEC: user address is not page-aligned, return EINVAL */
+        return EINVAL;
+    }
+    
+    switch(cryptid) {
+        case 0:
+            /* not encrypted, just an empty load command */
+            return 0;
+        case 1:
+            cryptname="com.apple.unfree";
+            break;
+        case 0x10:
+            /* some random cryptid that you could manually put into
+             * your binary if you want NULL */
+            cryptname="com.apple.null";
+            break;
+        default:
+            return EINVAL;
+    }
+    
+    if (NULL == text_crypter_create) return ENOTSUP;
+    
+    ret = fill_procregioninfo_onlymappedvnodes( proc_task(p), user_addr, &pinfo, &vnodeaddr, &vid);
+    if (ret == 0 || !vnodeaddr) {
+        /* No really, this returns 0 if the memory address is not backed by a file */
+        return (EINVAL);
+    }
+    
+    vp = (vnode_t)vnodeaddr;
+    if ((vnode_getwithvid(vp, vid)) == 0) {
+        MALLOC_ZONE(vpath, char *, MAXPATHLEN, M_NAMEI, M_WAITOK);
+        if(vpath == NULL) {
+            vnode_put(vp);
+            return (ENOMEM);
+        }
+        
+        len = MAXPATHLEN;
+        ret = vn_getpath(vp, vpath, &len);
+        if(ret) {
+            FREE_ZONE(vpath, MAXPATHLEN, M_NAMEI);
+            vnode_put(vp);
+            return (ret);
+        }
+        
+        vnode_put(vp);
+    } else {
+        return (EINVAL);
+    }
+
+#if 0
+    kprintf("%s vpath %s cryptid 0x%08x cputype 0x%08x cpusubtype 0x%08x range 0x%016llx size 0x%016llx\n",
+            __FUNCTION__, vpath, cryptid, cputype, cpusubtype, (uint64_t)user_addr, (uint64_t)user_size);
+#endif
 
-       ubc_setthreadcred(vp, current_proc(), current_thread());
-       (void)vnode_put(vp);
-       err = 0;
-bad:
-       fp_drop(p, fd, fp, 0);
-       return (err);
+    /* set up decrypter first */
+    crypt_file_data_t crypt_data = {
+        .filename = vpath,
+        .cputype = cputype,
+        .cpusubtype = cpusubtype };
+    result = text_crypter_create(&crypt_info, cryptname, (void*)&crypt_data);
+#if VM_MAP_DEBUG_APPLE_PROTECT
+    if (vm_map_debug_apple_protect) {
+           printf("APPLE_PROTECT: %d[%s] map %p [0x%llx:0x%llx] %s(%s) -> 0x%x\n",
+                  p->p_pid, p->p_comm,
+                  user_map,
+                  (uint64_t) user_addr,
+                  (uint64_t) (user_addr + user_size),
+                  __FUNCTION__, vpath, result);
+    }
+#endif /* VM_MAP_DEBUG_APPLE_PROTECT */
+    FREE_ZONE(vpath, MAXPATHLEN, M_NAMEI);
+    
+    if(result) {
+        printf("%s: unable to create decrypter %s, kr=%d\n",
+               __FUNCTION__, cryptname, result);
+        if (result == kIOReturnNotPrivileged) {
+            /* text encryption returned decryption failure */
+            return (EPERM);
+        } else {
+            return (ENOMEM);
+        }
+    }
+    
+    /* now remap using the decrypter */
+    vm_object_offset_t crypto_backing_offset;
+    crypto_backing_offset = -1;        /* i.e. use map entry's offset */
+    result = vm_map_apple_protected(user_map,
+                                   user_addr,
+                                   user_addr+user_size,
+                                   crypto_backing_offset,
+                                   &crypt_info);
+    if (result) {
+        printf("%s: mapping failed with %d\n", __FUNCTION__, result);
+    }
+   
+    if (result) {
+        return (EPERM);
+    }
+    return 0;
 }
-#endif         /* !defined(CONFIG_EMBEDDED) */
-
+#endif /* CONFIG_CODE_DECRYPTION */