xnu-7195.101.1.tar.gz

[apple/xnu.git] / bsd / kern / kern_mman.c

diff --git a/bsd/kern/kern_mman.c b/bsd/kern/kern_mman.c
index adb144567dbe2afe3242d67b95d84fda95369364..0cc17e529abaec1db52d89ed72ae1ba9aa049f6d 100644 (file)
--- a/bsd/kern/kern_mman.c
+++ b/bsd/kern/kern_mman.c
@@ -1,8 +1,8 @@
 /*
 /*

- * Copyright (c) 2007 Apple Inc. All Rights Reserved.
- * 
+ * Copyright (c) 2007-2020 Apple Inc. All Rights Reserved.
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*


@@ -113,6 +113,7 @@
 #include <mach/vm_map.h>
 #include <mach/host_priv.h>
 #include <mach/sdt.h>
 #include <mach/vm_map.h>
 #include <mach/host_priv.h>
 #include <mach/sdt.h>

+#include <mach-o/loader.h>

 
 #include <machine/machine_routines.h>
 
 
 #include <machine/machine_routines.h>
 


@@ -131,6 +132,35 @@
 #if CONFIG_MACF
 #include <security/mac_framework.h>
 #endif
 #if CONFIG_MACF
 #include <security/mac_framework.h>
 #endif

+#include <os/overflow.h>
+
+/*
+ * this function implements the same logic as dyld's "dyld_fall_2020_os_versions"
+ * from dyld_priv.h. this way we can consistently deny / allow allocations based
+ * on SDK version at fall 2020 level. Compare output to proc_sdk(current_proc())
+ */
+static uint32_t
+proc_2020_fall_os_sdk(void)
+{
+       switch (current_proc()->p_platform) {
+       case PLATFORM_MACOS:
+               return 0x000a1000; // DYLD_MACOSX_VERSION_10_16
+       case PLATFORM_IOS:
+       case PLATFORM_IOSSIMULATOR:
+       case PLATFORM_MACCATALYST:
+               return 0x000e0000; // DYLD_IOS_VERSION_14_0
+       case PLATFORM_BRIDGEOS:
+               return 0x00050000; // DYLD_BRIDGEOS_VERSION_5_0
+       case PLATFORM_TVOS:
+       case PLATFORM_TVOSSIMULATOR:
+               return 0x000e0000; // DYLD_TVOS_VERSION_14_0
+       case PLATFORM_WATCHOS:
+       case PLATFORM_WATCHOSSIMULATOR:
+               return 0x00070000; // DYLD_WATCHOS_VERSION_7_0
+       default:
+               return 0;
+       }
+}

 
 /*
  * XXX Internally, we use VM_PROT_* somewhat interchangeably, but the correct
 
 /*
  * XXX Internally, we use VM_PROT_* somewhat interchangeably, but the correct


@@ -144,33 +174,34 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
         *      Map in special device (must be SHARED) or file
         */
        struct fileproc *fp;
         *      Map in special device (must be SHARED) or file
         */
        struct fileproc *fp;

-       struct                  vnode *vp;
-       int                     flags;
-       int                     prot;
-       int                     err=0;
-       vm_map_t                user_map;
-       kern_return_t           result;
-       vm_map_offset_t         user_addr;
-       vm_map_size_t           user_size;
-       vm_object_offset_t      pageoff;
-       vm_object_offset_t      file_pos;
-       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;
-       memory_object_t         pager = MEMORY_OBJECT_NULL;
-       memory_object_control_t  control;
-       int                     mapanon=0;
-       int                     fpref=0;
-       int error =0;
+       struct                  vnode *vp;
+       int                     flags;
+       int                     prot;
+       int                     err = 0;
+       vm_map_t                user_map;
+       kern_return_t           result;
+       vm_map_offset_t         user_addr;
+       vm_map_offset_t         sum;
+       vm_map_size_t           user_size;
+       vm_object_offset_t      pageoff;
+       vm_object_offset_t      file_pos;
+       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;
+       memory_object_t         pager = MEMORY_OBJECT_NULL;
+       memory_object_control_t  control;
+       int                     mapanon = 0;
+       int                     fpref = 0;
+       int error = 0;

        int fd = uap->fd;
        int num_retries = 0;
 
        /*
         * Note that for UNIX03 conformance, there is additional parameter checking for
        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 
+        * 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.
         */
         * checks and argument validation done in this function are not the only places
         * one can get returned errnos.
         */


@@ -183,6 +214,9 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
        AUDIT_ARG(len, user_size);
        AUDIT_ARG(fd, uap->fd);
 
        AUDIT_ARG(len, user_size);
        AUDIT_ARG(fd, uap->fd);
 

+       if (vm_map_range_overflows(user_addr, user_size)) {
+               return EINVAL;
+       }

        prot = (uap->prot & VM_PROT_ALL);
 #if 3777787
        /*
        prot = (uap->prot & VM_PROT_ALL);
 #if 3777787
        /*


@@ -191,24 +225,83 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
         * for write or execute access, we must imply read access as well;
         * otherwise programs expecting this to work will fail to operate.
         */
         * for write or execute access, we must imply read access as well;
         * otherwise programs expecting this to work will fail to operate.
         */

-       if (prot & (VM_PROT_EXECUTE | VM_PROT_WRITE))
+       if (prot & (VM_PROT_EXECUTE | VM_PROT_WRITE)) {

                prot |= VM_PROT_READ;
                prot |= VM_PROT_READ;

-#endif /* radar 3777787 */
+       }
+#endif  /* radar 3777787 */

 
        flags = uap->flags;
        vp = NULLVP;
 
        /*
 
        flags = uap->flags;
        vp = NULLVP;
 
        /*

-        * The vm code does not have prototypes & compiler doesn't do the'
-        * the right thing when you cast 64bit value and pass it in function 
+        * verify no unknown flags are passed in, and if any are,
+        * fail out early to make sure the logic below never has to deal
+        * with invalid flag values
+        */
+       if (flags & ~(MAP_SHARED |
+           MAP_PRIVATE |
+           MAP_COPY |
+           MAP_FIXED |
+           MAP_RENAME |
+           MAP_NORESERVE |
+           MAP_RESERVED0080 |                                  //grandfathered in as accepted and ignored
+           MAP_NOEXTEND |
+           MAP_HASSEMAPHORE |
+           MAP_NOCACHE |
+           MAP_JIT |
+           MAP_FILE |
+           MAP_ANON |
+           MAP_RESILIENT_CODESIGN |
+           MAP_RESILIENT_MEDIA |
+#if XNU_TARGET_OS_OSX
+           MAP_32BIT |
+#endif
+           MAP_TRANSLATED_ALLOW_EXECUTE |
+           MAP_UNIX03)) {
+               if (proc_sdk(current_proc()) >= proc_2020_fall_os_sdk()) {
+                       return EINVAL;
+               }
+       }
+
+
+       /*
+        * The vm code does not have prototypes & compiler doesn't do
+        * the right thing when you cast 64bit value and pass it in function

         * call. So here it is.
         */
        file_pos = (vm_object_offset_t)uap->pos;
 
 
        /* make sure mapping fits into numeric range etc */
         * call. So here it is.
         */
        file_pos = (vm_object_offset_t)uap->pos;
 
 
        /* make sure mapping fits into numeric range etc */

-       if (file_pos + user_size > (vm_object_offset_t)-PAGE_SIZE_64)
-               return (EINVAL);
+       if (os_add3_overflow(file_pos, user_size, vm_map_page_size(user_map) - 1, &sum)) {
+               return EINVAL;
+       }
+
+       if (flags & MAP_UNIX03) {
+               vm_map_offset_t offset_alignment_mask;
+
+               /*
+                * Enforce UNIX03 compliance.
+                */
+
+               if (vm_map_is_exotic(current_map())) {
+                       offset_alignment_mask = 0xFFF;
+               } else {
+                       offset_alignment_mask = vm_map_page_mask(current_map());
+               }
+               if (file_pos & offset_alignment_mask) {
+                       /* file offset should be page-aligned */
+                       return EINVAL;
+               }
+               if (!(flags & (MAP_PRIVATE | MAP_SHARED))) {
+                       /* need either MAP_PRIVATE or MAP_SHARED */
+                       return EINVAL;
+               }
+               if (user_size == 0) {
+                       /* mapping length should not be 0 */
+                       return EINVAL;
+               }
+       }

 
        /*
         * Align the file position to a page boundary,
 
        /*
         * Align the file position to a page boundary,


@@ -219,9 +312,10 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
 
 
        /* Adjust size for rounding (on both ends). */
 
 
        /* Adjust size for rounding (on both ends). */

-       user_size += pageoff;   /* low end... */
-       user_size = vm_map_round_page(user_size,        
-                                     vm_map_page_mask(user_map)); /* 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) ||
 
        if (flags & MAP_JIT) {
                if ((flags & MAP_FIXED) ||


@@ -239,10 +333,36 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
                    (flags & MAP_JIT)) {
                        return EINVAL;
                }
                    (flags & MAP_JIT)) {
                        return EINVAL;
                }

-               if (prot & (VM_PROT_WRITE | VM_PROT_EXECUTE)) {
+       }
+       if (flags & MAP_RESILIENT_CODESIGN) {
+               int reject_prot = ((flags & MAP_PRIVATE) ? VM_PROT_EXECUTE : (VM_PROT_WRITE | VM_PROT_EXECUTE));
+               if (prot & reject_prot) {
+                       /*
+                        * Quick sanity check. maxprot is calculated below and
+                        * we will test it again.
+                        */

                        return EPERM;
                }
        }
                        return EPERM;
                }
        }

+       if (flags & MAP_SHARED) {
+               /*
+                * MAP_RESILIENT_MEDIA is not valid with MAP_SHARED because
+                * there is no place to inject zero-filled pages without
+                * actually adding them to the file.
+                * Since we didn't reject that combination before, there might
+                * already be callers using it and getting a valid MAP_SHARED
+                * mapping but without the resilience.
+                * For backwards compatibility's sake, let's keep ignoring
+                * MAP_RESILIENT_MEDIA in that case.
+                */
+               flags &= ~MAP_RESILIENT_MEDIA;
+       }
+       if (flags & MAP_RESILIENT_MEDIA) {
+               if ((flags & MAP_ANON) ||
+                   (flags & MAP_SHARED)) {
+                       return EINVAL;
+               }
+       }

 
        /*
         * Check for illegal addresses.  Watch out for address wrap... Note
 
        /*
         * Check for illegal addresses.  Watch out for address wrap... Note


@@ -255,8 +375,9 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
                 * should be aligned after adjustment by pageoff.
                 */
                user_addr -= pageoff;
                 * should be aligned after adjustment by pageoff.
                 */
                user_addr -= pageoff;

-               if (user_addr & vm_map_page_mask(user_map))
-                       return (EINVAL);
+               if (user_addr & vm_map_page_mask(user_map)) {
+                       return EINVAL;
+               }

        }
 #ifdef notyet
        /* DO not have apis to get this info, need to wait till then*/
        }
 #ifdef notyet
        /* DO not have apis to get this info, need to wait till then*/


@@ -269,16 +390,16 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
         * location.
         */
        else if (addr < vm_map_round_page(p->p_vmspace->vm_daddr + MAXDSIZ,
         * location.
         */
        else if (addr < vm_map_round_page(p->p_vmspace->vm_daddr + MAXDSIZ,

-                                         vm_map_page_mask(user_map)))
+           vm_map_page_mask(user_map))) {

                addr = vm_map_round_page(p->p_vmspace->vm_daddr + MAXDSIZ,
                addr = vm_map_round_page(p->p_vmspace->vm_daddr + MAXDSIZ,

-                                        vm_map_page_mask(user_map));
+                   vm_map_page_mask(user_map));
+       }

 
 #endif
 
        alloc_flags = 0;
 
        if (flags & MAP_ANON) {
 
 #endif
 
        alloc_flags = 0;
 
        if (flags & MAP_ANON) {

-

                maxprot = VM_PROT_ALL;
 #if CONFIG_MACF
                /*
                maxprot = VM_PROT_ALL;
 #if CONFIG_MACF
                /*


@@ -287,12 +408,12 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
                error = mac_proc_check_map_anon(p, user_addr, user_size, prot, flags, &maxprot);
                if (error) {
                        return EINVAL;
                error = mac_proc_check_map_anon(p, user_addr, user_size, prot, flags, &maxprot);
                if (error) {
                        return EINVAL;

-               }               
+               }

 #endif /* MAC */
 
                /*
                 * Mapping blank space is trivial.  Use positive fds as the alias
 #endif /* MAC */
 
                /*
                 * Mapping blank space is trivial.  Use positive fds as the alias

-                * value for memory tracking. 
+                * value for memory tracking.

                 */
                if (fd != -1) {
                        /*
                 */
                if (fd != -1) {
                        /*


@@ -300,8 +421,9 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
                         * (see the VM_FLAGS_* definitions).
                         */
                        alloc_flags = fd & (VM_FLAGS_ALIAS_MASK |
                         * (see the VM_FLAGS_* definitions).
                         */
                        alloc_flags = fd & (VM_FLAGS_ALIAS_MASK |

-                                           VM_FLAGS_SUPERPAGE_MASK |
-                                           VM_FLAGS_PURGABLE);
+                           VM_FLAGS_SUPERPAGE_MASK |
+                           VM_FLAGS_PURGABLE |
+                           VM_FLAGS_4GB_CHUNK);

                        if (alloc_flags != fd) {
                                /* reject if there are any extra flags */
                                return EINVAL;
                        if (alloc_flags != fd) {
                                /* reject if there are any extra flags */
                                return EINVAL;


@@ -309,26 +431,29 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
                        VM_GET_FLAGS_ALIAS(alloc_flags, tag);
                        alloc_flags &= ~VM_FLAGS_ALIAS_MASK;
                }
                        VM_GET_FLAGS_ALIAS(alloc_flags, tag);
                        alloc_flags &= ~VM_FLAGS_ALIAS_MASK;
                }

-                       
+

                handle = NULL;
                file_pos = 0;
                handle = NULL;
                file_pos = 0;

+               pageoff = 0;

                mapanon = 1;
        } else {
                struct vnode_attr va;
                vfs_context_t ctx = vfs_context_current();
 
                mapanon = 1;
        } else {
                struct vnode_attr va;
                vfs_context_t ctx = vfs_context_current();
 

-               if (flags & MAP_JIT)
+               if (flags & MAP_JIT) {

                        return EINVAL;
                        return EINVAL;

+               }

 
                /*
                 * Mapping file, get fp for validation. Obtain vnode and make
                 * sure it is of appropriate type.
                 */
                err = fp_lookup(p, fd, &fp, 0);
 
                /*
                 * Mapping file, get fp for validation. Obtain vnode and make
                 * sure it is of appropriate type.
                 */
                err = fp_lookup(p, fd, &fp, 0);

-               if (err)
-                       return(err);
+               if (err) {
+                       return err;
+               }

                fpref = 1;
                fpref = 1;

-               switch (FILEGLOB_DTYPE(fp->f_fglob)) {
+               switch (FILEGLOB_DTYPE(fp->fp_glob)) {

                case DTYPE_PSXSHM:
                        uap->addr = (user_addr_t)user_addr;
                        uap->len = (user_size_t)user_size;
                case DTYPE_PSXSHM:
                        uap->addr = (user_addr_t)user_addr;
                        uap->len = (user_size_t)user_size;


@@ -343,10 +468,11 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
                        error = EINVAL;
                        goto bad;
                }
                        error = EINVAL;
                        goto bad;
                }

-               vp = (struct vnode *)fp->f_fglob->fg_data;
+               vp = (struct vnode *)fp->fp_glob->fg_data;

                error = vnode_getwithref(vp);
                error = vnode_getwithref(vp);

-               if(error != 0)
+               if (error != 0) {

                        goto bad;
                        goto bad;

+               }

 
                if (vp->v_type != VREG && vp->v_type != VCHR) {
                        (void)vnode_put(vp);
 
                if (vp->v_type != VREG && vp->v_type != VCHR) {
                        (void)vnode_put(vp);


@@ -355,7 +481,7 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
                }
 
                AUDIT_ARG(vnpath, vp, ARG_VNODE1);
                }
 
                AUDIT_ARG(vnpath, vp, ARG_VNODE1);

-               
+

                /*
                 * POSIX: mmap needs to update access time for mapped files
                 */
                /*
                 * POSIX: mmap needs to update access time for mapped files
                 */


@@ -384,10 +510,10 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
                         * credentials do we use for determination? What if
                         * proc does a setuid?
                         */
                         * credentials do we use for determination? What if
                         * proc does a setuid?
                         */

-                       maxprot = VM_PROT_EXECUTE;      /* ??? */
-                       if (fp->f_fglob->fg_flag & FREAD)
+                       maxprot = VM_PROT_EXECUTE;      /* TODO: Remove this and restrict maxprot? */
+                       if (fp->fp_glob->fg_flag & FREAD) {

                                maxprot |= VM_PROT_READ;
                                maxprot |= VM_PROT_READ;

-                       else if (prot & PROT_READ) {
+                       } else if (prot & PROT_READ) {

                                (void)vnode_put(vp);
                                error = EACCES;
                                goto bad;
                                (void)vnode_put(vp);
                                error = EACCES;
                                goto bad;


@@ -397,57 +523,79 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
                         * MAP_SHARED or via the implicit sharing of character
                         * device mappings), and we are trying to get write
                         * permission although we opened it without asking
                         * MAP_SHARED or via the implicit sharing of character
                         * device mappings), and we are trying to get write
                         * permission although we opened it without asking

-                        * for it, bail out. 
+                        * for it, bail out.

                         */
 
                        if ((flags & MAP_SHARED) != 0) {
                         */
 
                        if ((flags & MAP_SHARED) != 0) {

-                               if ((fp->f_fglob->fg_flag & FWRITE) != 0 &&
+                               if ((fp->fp_glob->fg_flag & FWRITE) != 0 &&

                                    /*
                                    /*

-                                    * Do not allow writable mappings of 
+                                    * Do not allow writable mappings of

                                     * swap files (see vm_swapfile_pager.c).
                                     */
                                    !vnode_isswap(vp)) {
                                     * swap files (see vm_swapfile_pager.c).
                                     */
                                    !vnode_isswap(vp)) {

-                                       /*
-                                        * check for write access
-                                        *
-                                        * Note that we already made this check when granting FWRITE
-                                        * against the file, so it seems redundant here.
-                                        */
-                                       error = vnode_authorize(vp, NULL, KAUTH_VNODE_CHECKIMMUTABLE, ctx);
- 
-                                       /* if not granted for any reason, but we wanted it, bad */
-                                       if ((prot & PROT_WRITE) && (error != 0)) {
-                                               vnode_put(vp);
-                                               goto bad;
-                                       }
- 
-                                       /* if writable, remember */
-                                       if (error == 0)
-                                               maxprot |= VM_PROT_WRITE;
-
+                                       /*
+                                        * check for write access
+                                        *
+                                        * Note that we already made this check when granting FWRITE
+                                        * against the file, so it seems redundant here.
+                                        */
+                                       error = vnode_authorize(vp, NULL, KAUTH_VNODE_CHECKIMMUTABLE, ctx);
+
+                                       /* if not granted for any reason, but we wanted it, bad */
+                                       if ((prot & PROT_WRITE) && (error != 0)) {
+                                               vnode_put(vp);
+                                               goto bad;
+                                       }
+
+                                       /* if writable, remember */
+                                       if (error == 0) {
+                                               maxprot |= VM_PROT_WRITE;
+                                       }

                                } else if ((prot & PROT_WRITE) != 0) {
                                        (void)vnode_put(vp);
                                        error = EACCES;
                                        goto bad;
                                }
                                } else if ((prot & PROT_WRITE) != 0) {
                                        (void)vnode_put(vp);
                                        error = EACCES;
                                        goto bad;
                                }

-                       } else
+                       } else {

                                maxprot |= VM_PROT_WRITE;
                                maxprot |= VM_PROT_WRITE;

+                       }

 
                        handle = (void *)vp;
 #if CONFIG_MACF
                        error = mac_file_check_mmap(vfs_context_ucred(ctx),
 
                        handle = (void *)vp;
 #if CONFIG_MACF
                        error = mac_file_check_mmap(vfs_context_ucred(ctx),

-                           fp->f_fglob, prot, flags, file_pos, &maxprot);
+                           fp->fp_glob, prot, flags, file_pos + pageoff,
+                           &maxprot);

                        if (error) {
                                (void)vnode_put(vp);
                                goto bad;
                        }
 #endif /* MAC */
                        if (error) {
                                (void)vnode_put(vp);
                                goto bad;
                        }
 #endif /* MAC */

+                       /*
+                        * Consult the file system to determine if this
+                        * particular file object can be mapped.
+                        *
+                        * N.B. If MAP_PRIVATE (i.e. CoW) has been specified,
+                        * then we don't check for writeability on the file
+                        * object, because it will only ever see reads.
+                        */
+                       error = VNOP_MMAP_CHECK(vp, (flags & MAP_PRIVATE) ?
+                           (prot & ~PROT_WRITE) : prot, ctx);
+                       if (error) {
+                               (void)vnode_put(vp);
+                               goto bad;
+                       }

                }
                }

+
+               /*
+                * No copy-on-read for mmap() mappings themselves.
+                */
+               vmk_flags.vmkf_no_copy_on_read = 1;

        }
 
        }
 

-       if (user_size == 0)  {
-               if (!mapanon)
+       if (user_size == 0) {
+               if (!mapanon) {

                        (void)vnode_put(vp);
                        (void)vnode_put(vp);

+               }

                error = 0;
                goto bad;
        }
                error = 0;
                goto bad;
        }


@@ -457,11 +605,12 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
         *      to the nearest page boundary.
         */
        user_size = vm_map_round_page(user_size,
         *      to the nearest page boundary.
         */
        user_size = vm_map_round_page(user_size,

-                                     vm_map_page_mask(user_map));
+           vm_map_page_mask(user_map));

 
        if (file_pos & vm_map_page_mask(user_map)) {
 
        if (file_pos & vm_map_page_mask(user_map)) {

-               if (!mapanon)
+               if (!mapanon) {

                        (void)vnode_put(vp);
                        (void)vnode_put(vp);

+               }

                error = EINVAL;
                goto bad;
        }
                error = EINVAL;
                goto bad;
        }


@@ -469,12 +618,13 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
        if ((flags & MAP_FIXED) == 0) {
                alloc_flags |= VM_FLAGS_ANYWHERE;
                user_addr = vm_map_round_page(user_addr,
        if ((flags & MAP_FIXED) == 0) {
                alloc_flags |= VM_FLAGS_ANYWHERE;
                user_addr = vm_map_round_page(user_addr,

-                                             vm_map_page_mask(user_map));
+                   vm_map_page_mask(user_map));

        } else {
                if (user_addr != vm_map_trunc_page(user_addr,
        } else {
                if (user_addr != vm_map_trunc_page(user_addr,

-                                                  vm_map_page_mask(user_map))) {
-                       if (!mapanon)
-                               (void)vnode_put(vp);
+                   vm_map_page_mask(user_map))) {
+                       if (!mapanon) {
+                               (void)vnode_put(vp);
+                       }

                        error = EINVAL;
                        goto bad;
                }
                        error = EINVAL;
                        goto bad;
                }


@@ -492,16 +642,28 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
                alloc_flags |= VM_FLAGS_FIXED | VM_FLAGS_OVERWRITE;
        }
 
                alloc_flags |= VM_FLAGS_FIXED | VM_FLAGS_OVERWRITE;
        }
 

-       if (flags & MAP_NOCACHE)
+       if (flags & MAP_NOCACHE) {

                alloc_flags |= VM_FLAGS_NO_CACHE;
                alloc_flags |= VM_FLAGS_NO_CACHE;

+       }

 
        if (flags & MAP_JIT) {
                vmk_flags.vmkf_map_jit = TRUE;
        }
 
 
        if (flags & MAP_JIT) {
                vmk_flags.vmkf_map_jit = TRUE;
        }
 

+

        if (flags & MAP_RESILIENT_CODESIGN) {
                alloc_flags |= VM_FLAGS_RESILIENT_CODESIGN;
        }
        if (flags & MAP_RESILIENT_CODESIGN) {
                alloc_flags |= VM_FLAGS_RESILIENT_CODESIGN;
        }

+       if (flags & MAP_RESILIENT_MEDIA) {
+               alloc_flags |= VM_FLAGS_RESILIENT_MEDIA;
+       }
+
+#if XNU_TARGET_OS_OSX
+       /* macOS-specific MAP_32BIT flag handling */
+       if (flags & MAP_32BIT) {
+               vmk_flags.vmkf_32bit_map_va = TRUE;
+       }
+#endif

 
        /*
         * Lookup/allocate object.
 
        /*
         * Lookup/allocate object.


@@ -511,29 +673,34 @@ mmap(proc_t p, struct mmap_args *uap, user_addr_t *retval)
 #ifdef notyet
 /* Hmm .. */
 #if defined(VM_PROT_READ_IS_EXEC)
 #ifdef notyet
 /* Hmm .. */
 #if defined(VM_PROT_READ_IS_EXEC)

-               if (prot & VM_PROT_READ)
+               if (prot & VM_PROT_READ) {

                        prot |= VM_PROT_EXECUTE;
                        prot |= VM_PROT_EXECUTE;

-               if (maxprot & VM_PROT_READ)
+               }
+               if (maxprot & VM_PROT_READ) {

                        maxprot |= VM_PROT_EXECUTE;
                        maxprot |= VM_PROT_EXECUTE;

+               }

 #endif
 #endif
 
 #if 3777787
 #endif
 #endif
 
 #if 3777787

-               if (prot & (VM_PROT_EXECUTE | VM_PROT_WRITE))
+               if (prot & (VM_PROT_EXECUTE | VM_PROT_WRITE)) {

                        prot |= VM_PROT_READ;
                        prot |= VM_PROT_READ;

-               if (maxprot & (VM_PROT_EXECUTE | VM_PROT_WRITE))
+               }
+               if (maxprot & (VM_PROT_EXECUTE | VM_PROT_WRITE)) {

                        maxprot |= VM_PROT_READ;
                        maxprot |= VM_PROT_READ;

-#endif /* radar 3777787 */
+               }
+#endif  /* radar 3777787 */

 map_anon_retry:
 map_anon_retry:

+

                result = vm_map_enter_mem_object(user_map,
                result = vm_map_enter_mem_object(user_map,

-                                                &user_addr, user_size,
-                                                0, alloc_flags, vmk_flags,
-                                                tag,
-                                                IPC_PORT_NULL, 0, FALSE,
-                                                prot, maxprot,
-                                                (flags & MAP_SHARED) ?
-                                                VM_INHERIT_SHARE : 
-                                                VM_INHERIT_DEFAULT);
+                   &user_addr, user_size,
+                   0, alloc_flags, vmk_flags,
+                   tag,
+                   IPC_PORT_NULL, 0, FALSE,
+                   prot, maxprot,
+                   (flags & MAP_SHARED) ?
+                   VM_INHERIT_SHARE :
+                   VM_INHERIT_DEFAULT);

 
                /* If a non-binding address was specified for this anonymous
                 * mapping, retry the mapping with a zero base
 
                /* If a non-binding address was specified for this anonymous
                 * mapping, retry the mapping with a zero base


@@ -558,7 +725,7 @@ map_anon_retry:
                } else {
                        control = ubc_getobject(vp, UBC_FLAGS_NONE);
                }
                } else {
                        control = ubc_getobject(vp, UBC_FLAGS_NONE);
                }

-               
+

                if (control == NULL) {
                        (void)vnode_put(vp);
                        error = ENOMEM;
                if (control == NULL) {
                        (void)vnode_put(vp);
                        error = ENOMEM;


@@ -569,36 +736,49 @@ map_anon_retry:
                 *  Set credentials:
                 *      FIXME: if we're writing the file we need a way to
                 *      ensure that someone doesn't replace our R/W creds
                 *  Set credentials:
                 *      FIXME: if we're writing the file we need a way to
                 *      ensure that someone doesn't replace our R/W creds

-                *      with ones that only work for read.
+                *      with ones that only work for read.

                 */
 
                ubc_setthreadcred(vp, p, current_thread());
                docow = FALSE;
                 */
 
                ubc_setthreadcred(vp, p, current_thread());
                docow = FALSE;

-               if ((flags & (MAP_ANON|MAP_SHARED)) == 0) {
+               if ((flags & (MAP_ANON | MAP_SHARED)) == 0) {

                        docow = TRUE;
                }
 
 #ifdef notyet
 /* Hmm .. */
 #if defined(VM_PROT_READ_IS_EXEC)
                        docow = TRUE;
                }
 
 #ifdef notyet
 /* Hmm .. */
 #if defined(VM_PROT_READ_IS_EXEC)

-               if (prot & VM_PROT_READ)
+               if (prot & VM_PROT_READ) {

                        prot |= VM_PROT_EXECUTE;
                        prot |= VM_PROT_EXECUTE;

-               if (maxprot & VM_PROT_READ)
+               }
+               if (maxprot & VM_PROT_READ) {

                        maxprot |= VM_PROT_EXECUTE;
                        maxprot |= VM_PROT_EXECUTE;

+               }

 #endif
 #endif /* notyet */
 
 #if 3777787
 #endif
 #endif /* notyet */
 
 #if 3777787

-               if (prot & (VM_PROT_EXECUTE | VM_PROT_WRITE))
+               if (prot & (VM_PROT_EXECUTE | VM_PROT_WRITE)) {

                        prot |= VM_PROT_READ;
                        prot |= VM_PROT_READ;

-               if (maxprot & (VM_PROT_EXECUTE | VM_PROT_WRITE))
+               }
+               if (maxprot & (VM_PROT_EXECUTE | VM_PROT_WRITE)) {

                        maxprot |= VM_PROT_READ;
                        maxprot |= VM_PROT_READ;

-#endif /* radar 3777787 */
+               }
+#endif  /* radar 3777787 */

 
 map_file_retry:
 
 map_file_retry:

-               if ((flags & MAP_RESILIENT_CODESIGN) ||
-                   (flags & MAP_RESILIENT_MEDIA)) {
-                       if (prot & (VM_PROT_WRITE | VM_PROT_EXECUTE)) {
+               if (flags & MAP_RESILIENT_CODESIGN) {
+                       int reject_prot = ((flags & MAP_PRIVATE) ? VM_PROT_EXECUTE : (VM_PROT_WRITE | VM_PROT_EXECUTE));
+                       if (prot & reject_prot) {
+                               /*
+                                * Would like to use (prot | maxprot) here
+                                * but the assignment of VM_PROT_EXECUTE
+                                * to maxprot above would always fail the test.
+                                *
+                                * Skipping the check is ok, however, because we
+                                * restrict maxprot to prot just below in this
+                                * block.
+                                */

                                assert(!mapanon);
                                vnode_put(vp);
                                error = EPERM;
                                assert(!mapanon);
                                vnode_put(vp);
                                error = EPERM;


@@ -607,15 +787,23 @@ map_file_retry:
                        /* strictly limit access to "prot" */
                        maxprot &= prot;
                }
                        /* strictly limit access to "prot" */
                        maxprot &= prot;
                }

+
+               vm_object_offset_t end_pos = 0;
+               if (os_add_overflow(user_size, file_pos, &end_pos)) {
+                       vnode_put(vp);
+                       error = EINVAL;
+                       goto bad;
+               }
+

                result = vm_map_enter_mem_object_control(user_map,
                result = vm_map_enter_mem_object_control(user_map,

-                                                &user_addr, user_size,
-                                                0, alloc_flags, vmk_flags,
-                                                tag,
-                                                control, file_pos,
-                                                docow, prot, maxprot, 
-                                                (flags & MAP_SHARED) ?
-                                                VM_INHERIT_SHARE : 
-                                                VM_INHERIT_DEFAULT);
+                   &user_addr, user_size,
+                   0, alloc_flags, vmk_flags,
+                   tag,
+                   control, file_pos,
+                   docow, prot, maxprot,
+                   (flags & MAP_SHARED) ?
+                   VM_INHERIT_SHARE :
+                   VM_INHERIT_DEFAULT);

 
                /* If a non-binding address was specified for this file backed
                 * mapping, retry the mapping with a zero base
 
                /* If a non-binding address was specified for this file backed
                 * mapping, retry the mapping with a zero base


@@ -657,22 +845,23 @@ bad:
                 */
                memory_object_deallocate(pager);
        }
                 */
                memory_object_deallocate(pager);
        }

-       if (fpref)
+       if (fpref) {

                fp_drop(p, fd, fp, 0);
                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);
 
        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
+#if XNU_TARGET_OS_OSX

        KERNEL_DEBUG_CONSTANT((BSDDBG_CODE(DBG_BSD_SC_EXTENDED_INFO2, SYS_mmap) | DBG_FUNC_NONE), (uint32_t)(*retval >> 32), (uint32_t)(user_size >> 32),
        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);
+           (uint32_t)(file_pos >> 32), (uint32_t)file_pos, 0);
+#endif /* XNU_TARGET_OS_OSX */
+       return error;

 }
 
 int
 msync(__unused proc_t p, struct msync_args *uap, int32_t *retval)
 {
        __pthread_testcancel(1);
 }
 
 int
 msync(__unused proc_t p, struct msync_args *uap, int32_t *retval)
 {
        __pthread_testcancel(1);

-       return(msync_nocancel(p, (struct msync_nocancel_args *)uap, retval));
+       return msync_nocancel(p, (struct msync_nocancel_args *)uap, retval);

 }
 
 int
 }
 
 int


@@ -683,14 +872,17 @@ msync_nocancel(__unused proc_t p, struct msync_nocancel_args *uap, __unused int3
        int flags;
        vm_map_t user_map;
        int rv;
        int flags;
        vm_map_t user_map;
        int rv;

-       vm_sync_t sync_flags=0;
+       vm_sync_t sync_flags = 0;

 
        user_map = current_map();
        addr = (mach_vm_offset_t) uap->addr;
 
        user_map = current_map();
        addr = (mach_vm_offset_t) uap->addr;

-       size = (mach_vm_size_t)uap->len;
-#ifndef        CONFIG_EMBEDDED
+       size = (mach_vm_size_t) uap->len;
+#if XNU_TARGET_OS_OSX

        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);
        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);

-#endif
+#endif /* XNU_TARGET_OS_OSX */
+       if (mach_vm_range_overflows(addr, size)) {
+               return EINVAL;
+       }

        if (addr & vm_map_page_mask(user_map)) {
                /* UNIX SPEC: user address is not page-aligned, return EINVAL */
                return EINVAL;
        if (addr & vm_map_page_mask(user_map)) {
                /* UNIX SPEC: user address is not page-aligned, return EINVAL */
                return EINVAL;


@@ -699,57 +891,62 @@ msync_nocancel(__unused proc_t p, struct msync_nocancel_args *uap, __unused int3
                /*
                 * We cannot support this properly without maintaining
                 * list all mmaps done. Cannot use vm_map_entry as they could be
                /*
                 * We cannot support this properly without maintaining
                 * list all mmaps done. Cannot use vm_map_entry as they could be

-                * split or coalesced by indepenedant actions. So instead of 
+                * split or coalesced by indepenedant actions. So instead of

                 * inaccurate results, lets just return error as invalid size
                 * specified
                 */
                 * inaccurate results, lets just return error as invalid size
                 * specified
                 */

-               return (EINVAL); /* XXX breaks posix apps */
+               return EINVAL; /* XXX breaks posix apps */

        }
 
        flags = uap->flags;
        /* disallow contradictory flags */
        }
 
        flags = uap->flags;
        /* disallow contradictory flags */

-       if ((flags & (MS_SYNC|MS_ASYNC)) == (MS_SYNC|MS_ASYNC))
-               return (EINVAL);
+       if ((flags & (MS_SYNC | MS_ASYNC)) == (MS_SYNC | MS_ASYNC)) {
+               return EINVAL;
+       }

 
 

-       if (flags & MS_KILLPAGES)
-               sync_flags |= VM_SYNC_KILLPAGES;
-       if (flags & MS_DEACTIVATE)
-               sync_flags |= VM_SYNC_DEACTIVATE;
-       if (flags & MS_INVALIDATE)
-               sync_flags |= VM_SYNC_INVALIDATE;
+       if (flags & MS_KILLPAGES) {
+               sync_flags |= VM_SYNC_KILLPAGES;
+       }
+       if (flags & MS_DEACTIVATE) {
+               sync_flags |= VM_SYNC_DEACTIVATE;
+       }
+       if (flags & MS_INVALIDATE) {
+               sync_flags |= VM_SYNC_INVALIDATE;
+       }

 
 

-       if ( !(flags & (MS_KILLPAGES | MS_DEACTIVATE))) {
-               if (flags & MS_ASYNC) 
-                       sync_flags |= VM_SYNC_ASYNCHRONOUS;
-               else 
-                       sync_flags |= VM_SYNC_SYNCHRONOUS;
+       if (!(flags & (MS_KILLPAGES | MS_DEACTIVATE))) {
+               if (flags & MS_ASYNC) {
+                       sync_flags |= VM_SYNC_ASYNCHRONOUS;
+               } else {
+                       sync_flags |= VM_SYNC_SYNCHRONOUS;
+               }

        }
 
        }
 

-       sync_flags |= VM_SYNC_CONTIGUOUS;       /* complain if holes */
+       sync_flags |= VM_SYNC_CONTIGUOUS;       /* complain if holes */

 
        rv = mach_vm_msync(user_map, addr, size, sync_flags);
 
        switch (rv) {
        case KERN_SUCCESS:
                break;
 
        rv = mach_vm_msync(user_map, addr, size, sync_flags);
 
        switch (rv) {
        case KERN_SUCCESS:
                break;

-       case KERN_INVALID_ADDRESS:      /* hole in region being sync'ed */
-               return (ENOMEM);
+       case KERN_INVALID_ADDRESS:      /* hole in region being sync'ed */
+               return ENOMEM;

        case KERN_FAILURE:
        case KERN_FAILURE:

-               return (EIO);
+               return EIO;

        default:
        default:

-               return (EINVAL);
+               return EINVAL;

        }
        }

-       return (0);
+       return 0;

 }
 
 
 int
 munmap(__unused proc_t p, struct munmap_args *uap, __unused int32_t *retval)
 {
 }
 
 
 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;
-       vm_map_t                user_map;
+       mach_vm_offset_t        user_addr;
+       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_map = current_map();
        user_addr = (mach_vm_offset_t) uap->addr;


@@ -763,8 +960,9 @@ munmap(__unused proc_t p, struct munmap_args *uap, __unused int32_t *retval)
                return EINVAL;
        }
 
                return EINVAL;
        }
 

-       if (user_addr + user_size < user_addr)
-               return(EINVAL);
+       if (mach_vm_range_overflows(user_addr, user_size)) {
+               return EINVAL;
+       }

 
        if (user_size == 0) {
                /* UNIX SPEC: size is 0, return EINVAL */
 
        if (user_size == 0) {
                /* UNIX SPEC: size is 0, return EINVAL */


@@ -773,19 +971,19 @@ munmap(__unused proc_t p, struct munmap_args *uap, __unused int32_t *retval)
 
        result = mach_vm_deallocate(user_map, user_addr, user_size);
        if (result != KERN_SUCCESS) {
 
        result = mach_vm_deallocate(user_map, user_addr, user_size);
        if (result != KERN_SUCCESS) {

-               return(EINVAL);
+               return EINVAL;

        }
        }

-       return(0);
+       return 0;

 }
 
 int
 mprotect(__unused proc_t p, struct mprotect_args *uap, __unused int32_t *retval)
 {
        vm_prot_t prot;
 }
 
 int
 mprotect(__unused proc_t p, struct mprotect_args *uap, __unused int32_t *retval)
 {
        vm_prot_t prot;

-       mach_vm_offset_t        user_addr;
-       mach_vm_size_t  user_size;
-       kern_return_t   result;
-       vm_map_t        user_map;
+       mach_vm_offset_t        user_addr;
+       mach_vm_size_t  user_size;
+       kern_return_t   result;
+       vm_map_t        user_map;

 #if CONFIG_MACF
        int error;
 #endif
 #if CONFIG_MACF
        int error;
 #endif


@@ -799,27 +997,33 @@ mprotect(__unused proc_t p, struct mprotect_args *uap, __unused int32_t *retval)
        user_size = (mach_vm_size_t) uap->len;
        prot = (vm_prot_t)(uap->prot & (VM_PROT_ALL | VM_PROT_TRUSTED | VM_PROT_STRIP_READ));
 
        user_size = (mach_vm_size_t) uap->len;
        prot = (vm_prot_t)(uap->prot & (VM_PROT_ALL | VM_PROT_TRUSTED | VM_PROT_STRIP_READ));
 

+       if (mach_vm_range_overflows(user_addr, user_size)) {
+               return EINVAL;
+       }

        if (user_addr & vm_map_page_mask(user_map)) {
                /* UNIX SPEC: user address is not page-aligned, return EINVAL */
                return EINVAL;
        }
        if (user_addr & vm_map_page_mask(user_map)) {
                /* UNIX SPEC: user address is not page-aligned, return EINVAL */
                return EINVAL;
        }

-               
+

 #ifdef notyet
 /* Hmm .. */
 #if defined(VM_PROT_READ_IS_EXEC)
 #ifdef notyet
 /* Hmm .. */
 #if defined(VM_PROT_READ_IS_EXEC)

-       if (prot & VM_PROT_READ)
+       if (prot & VM_PROT_READ) {

                prot |= VM_PROT_EXECUTE;
                prot |= VM_PROT_EXECUTE;

+       }

 #endif
 #endif /* notyet */
 
 #if 3936456
 #endif
 #endif /* notyet */
 
 #if 3936456

-       if (prot & (VM_PROT_EXECUTE | VM_PROT_WRITE))
+       if (prot & (VM_PROT_EXECUTE | VM_PROT_WRITE)) {

                prot |= VM_PROT_READ;
                prot |= VM_PROT_READ;

-#endif /* 3936456 */
+       }
+#endif  /* 3936456 */

 
 #if defined(__arm64__)
 
 #if defined(__arm64__)

-       if (prot & VM_PROT_STRIP_READ)
+       if (prot & VM_PROT_STRIP_READ) {

                prot &= ~(VM_PROT_READ | VM_PROT_STRIP_READ);
                prot &= ~(VM_PROT_READ | VM_PROT_STRIP_READ);

+       }

 #endif
 
 #if CONFIG_MACF
 #endif
 
 #if CONFIG_MACF


@@ -834,53 +1038,54 @@ mprotect(__unused proc_t p, struct mprotect_args *uap, __unused int32_t *retval)
         * e.g., making the stack executable.
         */
        error = mac_proc_check_mprotect(p, user_addr,
         * e.g., making the stack executable.
         */
        error = mac_proc_check_mprotect(p, user_addr,

-                       user_size, prot);
-       if (error)
-               return (error);
+           user_size, prot);
+       if (error) {
+               return error;
+       }

 #endif
 
 #endif
 

-       if(prot & VM_PROT_TRUSTED) {
+       if (prot & VM_PROT_TRUSTED) {

 #if CONFIG_DYNAMIC_CODE_SIGNING
                /* CODE SIGNING ENFORCEMENT - JIT support */
                /* The special protection value VM_PROT_TRUSTED requests that we treat
                 * this page as if it had a valid code signature.
 #if CONFIG_DYNAMIC_CODE_SIGNING
                /* CODE SIGNING ENFORCEMENT - JIT support */
                /* The special protection value VM_PROT_TRUSTED requests that we treat
                 * this page as if it had a valid code signature.

-                * If this is enabled, there MUST be a MAC policy implementing the 
+                * If this is enabled, there MUST be a MAC policy implementing the

                 * 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(
                 * 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, 
+                       user_map,

                        vm_map_trunc_page(user_addr,
                        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)));
+                       vm_map_page_mask(user_map)),
+                       vm_map_round_page(user_addr + user_size,
+                       vm_map_page_mask(user_map)));

                switch (result) {
                switch (result) {

-                       case KERN_SUCCESS:
-                               break;
-                       case KERN_INVALID_ADDRESS:
-                               /* UNIX SPEC: for an invalid address range, return ENOMEM */
-                               return ENOMEM;
-                       default:
-                               return EINVAL;
+               case KERN_SUCCESS:
+                       break;
+               case KERN_INVALID_ADDRESS:
+                       /* UNIX SPEC: for an invalid address range, return ENOMEM */
+                       return ENOMEM;
+               default:
+                       return EINVAL;

                }
 #else
                return ENOTSUP;
 #endif
        }
        prot &= ~VM_PROT_TRUSTED;
                }
 #else
                return ENOTSUP;
 #endif
        }
        prot &= ~VM_PROT_TRUSTED;

-       
+

        result = mach_vm_protect(user_map, user_addr, user_size,
        result = mach_vm_protect(user_map, user_addr, user_size,

-                                FALSE, prot);
+           FALSE, prot);

        switch (result) {
        case KERN_SUCCESS:
        switch (result) {
        case KERN_SUCCESS:

-               return (0);
+               return 0;

        case KERN_PROTECTION_FAILURE:
        case KERN_PROTECTION_FAILURE:

-               return (EACCES);
+               return EACCES;

        case KERN_INVALID_ADDRESS:
                /* UNIX SPEC: for an invalid address range, return ENOMEM */
                return ENOMEM;
        }
        case KERN_INVALID_ADDRESS:
                /* UNIX SPEC: for an invalid address range, return ENOMEM */
                return ENOMEM;
        }

-       return (EINVAL);
+       return EINVAL;

 }
 
 
 }
 
 


@@ -890,8 +1095,8 @@ minherit(__unused proc_t p, struct minherit_args *uap, __unused int32_t *retval)
        mach_vm_offset_t addr;
        mach_vm_size_t size;
        vm_inherit_t inherit;
        mach_vm_offset_t addr;
        mach_vm_size_t size;
        vm_inherit_t inherit;

-       vm_map_t        user_map;
-       kern_return_t   result;
+       vm_map_t        user_map;
+       kern_return_t   result;

 
        AUDIT_ARG(addr, uap->addr);
        AUDIT_ARG(len, uap->len);
 
        AUDIT_ARG(addr, uap->addr);
        AUDIT_ARG(len, uap->len);


@@ -900,17 +1105,19 @@ minherit(__unused proc_t p, struct minherit_args *uap, __unused int32_t *retval)
        addr = (mach_vm_offset_t)uap->addr;
        size = (mach_vm_size_t)uap->len;
        inherit = uap->inherit;
        addr = (mach_vm_offset_t)uap->addr;
        size = (mach_vm_size_t)uap->len;
        inherit = uap->inherit;

-
+       if (mach_vm_range_overflows(addr, size)) {
+               return EINVAL;
+       }

        user_map = current_map();
        result = mach_vm_inherit(user_map, addr, size,
        user_map = current_map();
        result = mach_vm_inherit(user_map, addr, size,

-                               inherit);
+           inherit);

        switch (result) {
        case KERN_SUCCESS:
        switch (result) {
        case KERN_SUCCESS:

-               return (0);
+               return 0;

        case KERN_PROTECTION_FAILURE:
        case KERN_PROTECTION_FAILURE:

-               return (EACCES);
+               return EACCES;

        }
        }

-       return (EINVAL);
+       return EINVAL;

 }
 
 int
 }
 
 int


@@ -920,72 +1127,74 @@ madvise(__unused proc_t p, struct madvise_args *uap, __unused int32_t *retval)
        mach_vm_offset_t start;
        mach_vm_size_t size;
        vm_behavior_t new_behavior;
        mach_vm_offset_t start;
        mach_vm_size_t size;
        vm_behavior_t new_behavior;

-       kern_return_t   result;
+       kern_return_t   result;

 
        /*
         * Since this routine is only advisory, we default to conservative
         * behavior.
         */
        switch (uap->behav) {
 
        /*
         * Since this routine is only advisory, we default to conservative
         * behavior.
         */
        switch (uap->behav) {

-               case MADV_RANDOM:
-                       new_behavior = VM_BEHAVIOR_RANDOM;
-                       break;
-               case MADV_SEQUENTIAL: 
-                       new_behavior = VM_BEHAVIOR_SEQUENTIAL;
-                       break;
-               case MADV_NORMAL:
-                       new_behavior = VM_BEHAVIOR_DEFAULT;
-                       break;
-               case MADV_WILLNEED:
-                       new_behavior = VM_BEHAVIOR_WILLNEED;
-                       break;
-               case MADV_DONTNEED:
-                       new_behavior = VM_BEHAVIOR_DONTNEED;
-                       break;
-               case MADV_FREE:
-                       new_behavior = VM_BEHAVIOR_FREE;
-                       break;
-               case MADV_ZERO_WIRED_PAGES:
-                       new_behavior = VM_BEHAVIOR_ZERO_WIRED_PAGES;
-                       break;
-               case MADV_FREE_REUSABLE:
-                       new_behavior = VM_BEHAVIOR_REUSABLE;
-                       break;
-               case MADV_FREE_REUSE:
-                       new_behavior = VM_BEHAVIOR_REUSE;
-                       break;
-               case MADV_CAN_REUSE:
-                       new_behavior = VM_BEHAVIOR_CAN_REUSE;
-                       break;
-               case MADV_PAGEOUT:
+       case MADV_RANDOM:
+               new_behavior = VM_BEHAVIOR_RANDOM;
+               break;
+       case MADV_SEQUENTIAL:
+               new_behavior = VM_BEHAVIOR_SEQUENTIAL;
+               break;
+       case MADV_NORMAL:
+               new_behavior = VM_BEHAVIOR_DEFAULT;
+               break;
+       case MADV_WILLNEED:
+               new_behavior = VM_BEHAVIOR_WILLNEED;
+               break;
+       case MADV_DONTNEED:
+               new_behavior = VM_BEHAVIOR_DONTNEED;
+               break;
+       case MADV_FREE:
+               new_behavior = VM_BEHAVIOR_FREE;
+               break;
+       case MADV_ZERO_WIRED_PAGES:
+               new_behavior = VM_BEHAVIOR_ZERO_WIRED_PAGES;
+               break;
+       case MADV_FREE_REUSABLE:
+               new_behavior = VM_BEHAVIOR_REUSABLE;
+               break;
+       case MADV_FREE_REUSE:
+               new_behavior = VM_BEHAVIOR_REUSE;
+               break;
+       case MADV_CAN_REUSE:
+               new_behavior = VM_BEHAVIOR_CAN_REUSE;
+               break;
+       case MADV_PAGEOUT:

 #if MACH_ASSERT
 #if MACH_ASSERT

-                       new_behavior = VM_BEHAVIOR_PAGEOUT;
-                       break;
+               new_behavior = VM_BEHAVIOR_PAGEOUT;
+               break;

 #else /* MACH_ASSERT */
 #else /* MACH_ASSERT */

-                       return ENOTSUP;
+               return ENOTSUP;

 #endif /* MACH_ASSERT */
 #endif /* MACH_ASSERT */

-               default:
-                       return(EINVAL);
+       default:
+               return EINVAL;

        }
 
        start = (mach_vm_offset_t) uap->addr;
        size = (mach_vm_size_t) uap->len;
        }
 
        start = (mach_vm_offset_t) uap->addr;
        size = (mach_vm_size_t) uap->len;

-       
+       if (mach_vm_range_overflows(start, size)) {
+               return EINVAL;
+       }

 #if __arm64__
        if (start == 0 &&
            size != 0 &&
            (uap->behav == MADV_FREE ||
 #if __arm64__
        if (start == 0 &&
            size != 0 &&
            (uap->behav == MADV_FREE ||

-            uap->behav == MADV_FREE_REUSABLE)) {
+           uap->behav == MADV_FREE_REUSABLE)) {

                printf("** FOURK_COMPAT: %d[%s] "
                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"));
+                   "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,
                DTRACE_VM3(fourk_compat_madvise,

-                          uint64_t, start,
-                          uint64_t, size,
-                          int, uap->behav);
+                   uint64_t, start,
+                   uint64_t, size,
+                   int, uap->behav);

                return EINVAL;
        }
 #endif /* __arm64__ */
                return EINVAL;
        }
 #endif /* __arm64__ */


@@ -998,7 +1207,7 @@ madvise(__unused proc_t p, struct madvise_args *uap, __unused int32_t *retval)
                return 0;
        case KERN_INVALID_ADDRESS:
                return EINVAL;
                return 0;
        case KERN_INVALID_ADDRESS:
                return EINVAL;

-       case KERN_NO_SPACE:     
+       case KERN_NO_SPACE:

                return ENOMEM;
        }
 
                return ENOMEM;
        }
 


@@ -1012,45 +1221,63 @@ mincore(__unused proc_t p, struct mincore_args *uap, __unused int32_t *retval)
        vm_map_t map = VM_MAP_NULL;
        user_addr_t vec = 0;
        int error = 0;
        vm_map_t map = VM_MAP_NULL;
        user_addr_t vec = 0;
        int error = 0;

-       int vecindex = 0, lastvecindex = 0;
-       int mincoreinfo=0;
+       int64_t lastvecindex = 0;
+       int mincoreinfo = 0;

        int pqueryinfo = 0;
        int pqueryinfo = 0;

-       unsigned int pqueryinfo_vec_size = 0;
+       uint64_t pqueryinfo_vec_size = 0;

        vm_page_info_basic_t info = NULL;
        mach_msg_type_number_t count = 0;
        char *kernel_vec = NULL;
        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;
+       uint64_t req_vec_size_pages = 0, cur_vec_size_pages = 0, vecindex = 0;

        kern_return_t kr = KERN_SUCCESS;
        kern_return_t kr = KERN_SUCCESS;

+       int effective_page_shift, effective_page_size;

 
        map = current_map();
 
 
        map = current_map();
 

+       /*
+        * On systems with 4k kernel space and 16k user space, we will
+        * use the kernel page size to report back the residency information.
+        * This is for backwards compatibility since we already have
+        * processes that depend on this behavior.
+        */
+       if (vm_map_page_shift(map) < PAGE_SHIFT) {
+               effective_page_shift = vm_map_page_shift(map);
+               effective_page_size = vm_map_page_size(map);
+       } else {
+               effective_page_shift = PAGE_SHIFT;
+               effective_page_size = PAGE_SIZE;
+       }
+

        /*
         * Make sure that the addresses presented are valid for user
         * mode.
         */
        first_addr = addr = vm_map_trunc_page(uap->addr,
        /*
         * Make sure that the addresses presented are valid for user
         * mode.
         */
        first_addr = addr = vm_map_trunc_page(uap->addr,

-                                             vm_map_page_mask(map));
+           vm_map_page_mask(map));

        end = vm_map_round_page(uap->addr + uap->len,
        end = vm_map_round_page(uap->addr + uap->len,

-                                      vm_map_page_mask(map));
+           vm_map_page_mask(map));

 
 

-       if (end < addr)
-               return (EINVAL);
+       if (end < addr) {
+               return EINVAL;
+       }

 
 

-       if (end == addr)
-               return (0);
+       if (end == addr) {
+               return 0;
+       }

 
        /*
         * We are going to loop through the whole 'req_vec_size' pages
         * range in chunks of 'cur_vec_size'.
         */
 
 
        /*
         * We are going to loop through the whole 'req_vec_size' pages
         * range in chunks of 'cur_vec_size'.
         */
 

-       req_vec_size_pages = (end - addr) >> PAGE_SHIFT;
-       cur_vec_size_pages = MIN(req_vec_size_pages, (int)(MAX_PAGE_RANGE_QUERY >> PAGE_SHIFT));
+       req_vec_size_pages = (end - addr) >> effective_page_shift;
+       cur_vec_size_pages = MIN(req_vec_size_pages, (MAX_PAGE_RANGE_QUERY >> effective_page_shift));
+       size_t kernel_vec_size = cur_vec_size_pages;

 
 

-       kernel_vec = (void*) _MALLOC(cur_vec_size_pages * sizeof(char), M_TEMP, M_WAITOK);
+       kernel_vec = kheap_alloc(KHEAP_TEMP, kernel_vec_size, Z_WAITOK | Z_ZERO);

 
        if (kernel_vec == NULL) {
 
        if (kernel_vec == NULL) {

-               return (ENOMEM);
+               return ENOMEM;

        }
 
        /*
        }
 
        /*


@@ -1059,24 +1286,25 @@ mincore(__unused proc_t p, struct mincore_args *uap, __unused int32_t *retval)
        vec = uap->vec;
 
        pqueryinfo_vec_size = cur_vec_size_pages * sizeof(struct vm_page_info_basic);
        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);
+
+       info = kheap_alloc(KHEAP_TEMP, pqueryinfo_vec_size, Z_WAITOK);

 
        if (info == NULL) {
 
        if (info == NULL) {

-               FREE(kernel_vec, M_TEMP);
-               return (ENOMEM);
+               kheap_free(KHEAP_TEMP, kernel_vec, kernel_vec_size);
+               return ENOMEM;

        }
 
        while (addr < end) {
        }
 
        while (addr < end) {

-
-               cur_end = addr + (cur_vec_size_pages * PAGE_SIZE_64);
+               cur_end = addr + (cur_vec_size_pages * effective_page_size);

 
                count =  VM_PAGE_INFO_BASIC_COUNT;
                kr = vm_map_page_range_info_internal(map,
 
                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);
+                   addr,
+                   cur_end,
+                   effective_page_shift,
+                   VM_PAGE_INFO_BASIC,
+                   (vm_page_info_t) info,
+                   &count);

 
                assert(kr == KERN_SUCCESS);
 
 
                assert(kr == KERN_SUCCESS);
 


@@ -1086,28 +1314,34 @@ mincore(__unused proc_t p, struct mincore_args *uap, __unused int32_t *retval)
                 * up the pages elsewhere.
                 */
                lastvecindex = -1;
                 * up the pages elsewhere.
                 */
                lastvecindex = -1;

-               for( ; addr < cur_end; addr += PAGE_SIZE ) {

 
 

+               for (; addr < cur_end; addr += effective_page_size) {

                        pqueryinfo = info[lastvecindex + 1].disposition;
 
                        mincoreinfo = 0;
 
                        pqueryinfo = info[lastvecindex + 1].disposition;
 
                        mincoreinfo = 0;
 

-                       if (pqueryinfo & VM_PAGE_QUERY_PAGE_PRESENT)
+                       if (pqueryinfo & VM_PAGE_QUERY_PAGE_PRESENT) {

                                mincoreinfo |= MINCORE_INCORE;
                                mincoreinfo |= MINCORE_INCORE;

-                       if (pqueryinfo & VM_PAGE_QUERY_PAGE_REF)
+                       }
+                       if (pqueryinfo & VM_PAGE_QUERY_PAGE_REF) {

                                mincoreinfo |= MINCORE_REFERENCED;
                                mincoreinfo |= MINCORE_REFERENCED;

-                       if (pqueryinfo & VM_PAGE_QUERY_PAGE_DIRTY)
+                       }
+                       if (pqueryinfo & VM_PAGE_QUERY_PAGE_DIRTY) {

                                mincoreinfo |= MINCORE_MODIFIED;
                                mincoreinfo |= MINCORE_MODIFIED;

-                       if (pqueryinfo & VM_PAGE_QUERY_PAGE_PAGED_OUT)
+                       }
+                       if (pqueryinfo & VM_PAGE_QUERY_PAGE_PAGED_OUT) {

                                mincoreinfo |= MINCORE_PAGED_OUT;
                                mincoreinfo |= MINCORE_PAGED_OUT;

-                       if (pqueryinfo & VM_PAGE_QUERY_PAGE_COPIED)
+                       }
+                       if (pqueryinfo & VM_PAGE_QUERY_PAGE_COPIED) {

                                mincoreinfo |= MINCORE_COPIED;
                                mincoreinfo |= MINCORE_COPIED;

-                       if ((pqueryinfo & VM_PAGE_QUERY_PAGE_EXTERNAL) == 0)
+                       }
+                       if ((pqueryinfo & VM_PAGE_QUERY_PAGE_EXTERNAL) == 0) {

                                mincoreinfo |= MINCORE_ANONYMOUS;
                                mincoreinfo |= MINCORE_ANONYMOUS;

+                       }

                        /*
                         * calculate index into user supplied byte vector
                         */
                        /*
                         * calculate index into user supplied byte vector
                         */

-                       vecindex = (addr - first_addr)>> PAGE_SHIFT;
+                       vecindex = (addr - first_addr) >> effective_page_shift;

                        kernel_vec[vecindex] = (char)mincoreinfo;
                        lastvecindex = vecindex;
                }
                        kernel_vec[vecindex] = (char)mincoreinfo;
                        lastvecindex = vecindex;
                }


@@ -1128,20 +1362,20 @@ mincore(__unused proc_t p, struct mincore_args *uap, __unused int32_t *retval)
                 * - starting address
                 */
                vec += cur_vec_size_pages * sizeof(char);
                 * - 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));
+               req_vec_size_pages = (end - addr) >> effective_page_shift;
+               cur_vec_size_pages = MIN(req_vec_size_pages, (MAX_PAGE_RANGE_QUERY >> effective_page_shift));

 
                first_addr = addr;
        }
 
 
                first_addr = addr;
        }
 

-       FREE(kernel_vec, M_TEMP);
-       FREE(info, M_TEMP);
+       kheap_free(KHEAP_TEMP, info, pqueryinfo_vec_size);
+       kheap_free(KHEAP_TEMP, kernel_vec, kernel_vec_size);

 
        if (error) {
 
        if (error) {

-               return (EFAULT);
+               return EFAULT;

        }
 
        }
 

-       return (0);
+       return 0;

 }
 
 int
 }
 
 int


@@ -1150,7 +1384,7 @@ mlock(__unused proc_t p, struct mlock_args *uap, __unused int32_t *retvalval)
        vm_map_t user_map;
        vm_map_offset_t addr;
        vm_map_size_t size, pageoff;
        vm_map_t user_map;
        vm_map_offset_t addr;
        vm_map_size_t size, pageoff;

-       kern_return_t   result;
+       kern_return_t   result;

 
        AUDIT_ARG(addr, uap->addr);
        AUDIT_ARG(len, uap->len);
 
        AUDIT_ARG(addr, uap->addr);
        AUDIT_ARG(len, uap->len);


@@ -1158,29 +1392,31 @@ mlock(__unused proc_t p, struct mlock_args *uap, __unused int32_t *retvalval)
        addr = (vm_map_offset_t) uap->addr;
        size = (vm_map_size_t)uap->len;
 
        addr = (vm_map_offset_t) uap->addr;
        size = (vm_map_size_t)uap->len;
 

-       /* disable wrap around */
-       if (addr + size < addr)
-               return (EINVAL);
+       if (vm_map_range_overflows(addr, size)) {
+               return EINVAL;
+       }

 
 

-       if (size == 0)
-               return (0);
+       if (size == 0) {
+               return 0;
+       }

 
        user_map = current_map();
        pageoff = (addr & vm_map_page_mask(user_map));
        addr -= 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));
+       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 */
 
        /* have to call vm_map_wire directly to pass "I don't know" protections */

-       result = vm_map_wire_kernel(user_map, addr, addr+size, VM_PROT_NONE, VM_KERN_MEMORY_MLOCK, TRUE);
+       result = vm_map_wire_kernel(user_map, addr, addr + size, VM_PROT_NONE, VM_KERN_MEMORY_MLOCK, TRUE);

 
 

-       if (result == KERN_RESOURCE_SHORTAGE)
+       if (result == KERN_RESOURCE_SHORTAGE) {

                return EAGAIN;
                return EAGAIN;

-       else if (result == KERN_PROTECTION_FAILURE)
+       } else if (result == KERN_PROTECTION_FAILURE) {

                return EACCES;
                return EACCES;

-       else if (result != KERN_SUCCESS)
+       } else if (result != KERN_SUCCESS) {

                return ENOMEM;
                return ENOMEM;

+       }

 
 

-       return 0;       /* KERN_SUCCESS */
+       return 0;       /* KERN_SUCCESS */

 }
 
 int
 }
 
 int


@@ -1189,163 +1425,169 @@ munlock(__unused proc_t p, struct munlock_args *uap, __unused int32_t *retval)
        mach_vm_offset_t addr;
        mach_vm_size_t size;
        vm_map_t user_map;
        mach_vm_offset_t addr;
        mach_vm_size_t size;
        vm_map_t user_map;

-       kern_return_t   result;
+       kern_return_t   result;

 
        AUDIT_ARG(addr, uap->addr);
 
        AUDIT_ARG(addr, uap->addr);

-       AUDIT_ARG(addr, uap->len);
+       AUDIT_ARG(len, uap->len);

 
        addr = (mach_vm_offset_t) uap->addr;
        size = (mach_vm_size_t)uap->len;
        user_map = current_map();
 
        addr = (mach_vm_offset_t) uap->addr;
        size = (mach_vm_size_t)uap->len;
        user_map = current_map();

-
+       if (mach_vm_range_overflows(addr, size)) {
+               return EINVAL;
+       }

        /* JMM - need to remove all wirings by spec - this just removes one */
        result = mach_vm_wire_kernel(host_priv_self(), user_map, addr, size, VM_PROT_NONE, VM_KERN_MEMORY_MLOCK);
        /* JMM - need to remove all wirings by spec - this just removes one */
        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);
+       return result == KERN_SUCCESS ? 0 : ENOMEM;

 }
 
 
 int
 mlockall(__unused proc_t p, __unused struct mlockall_args *uap, __unused int32_t *retval)
 {
 }
 
 
 int
 mlockall(__unused proc_t p, __unused struct mlockall_args *uap, __unused int32_t *retval)
 {

-       return (ENOSYS);
+       return ENOSYS;

 }
 
 int
 munlockall(__unused proc_t p, __unused struct munlockall_args *uap, __unused int32_t *retval)
 {
 }
 
 int
 munlockall(__unused proc_t p, __unused struct munlockall_args *uap, __unused int32_t *retval)
 {

-       return(ENOSYS);
+       return ENOSYS;

 }
 
 #if CONFIG_CODE_DECRYPTION
 int
 mremap_encrypted(__unused struct proc *p, struct mremap_encrypted_args *uap, __unused int32_t *retval)
 {
 }
 
 #if CONFIG_CODE_DECRYPTION
 int
 mremap_encrypted(__unused struct proc *p, struct mremap_encrypted_args *uap, __unused int32_t *retval)
 {

-    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);
-    }
+       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 (mach_vm_range_overflows(user_addr, user_size)) {
+               return EINVAL;
+       }
+       if (user_addr & vm_map_page_mask(user_map)) {
+               /* UNIX SPEC: user address is not page-aligned, return EINVAL */
+               return EINVAL;
+       }
+
+       switch (cryptid) {
+       case CRYPTID_NO_ENCRYPTION:
+               /* not encrypted, just an empty load command */
+               return 0;
+       case CRYPTID_APP_ENCRYPTION:
+       case CRYPTID_MODEL_ENCRYPTION:
+               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) {
+               vpath = zalloc(ZV_NAMEI);
+
+               len = MAXPATHLEN;
+               ret = vn_getpath(vp, vpath, &len);
+               if (ret) {
+                       zfree(ZV_NAMEI, vpath);
+                       vnode_put(vp);
+                       return ret;
+               }
+
+               vnode_put(vp);
+       } else {
+               return EINVAL;
+       }

 
 #if 0
 
 #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);
+       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
 
 #endif
 

-    /* 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);
+       /* 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

-    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);
-    }
+       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 */
 #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;
+       zfree(ZV_NAMEI, vpath);
+
+       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,
+           cryptid);
+       if (result) {
+               printf("%s: mapping failed with %d\n", __FUNCTION__, result);
+       }
+
+       if (result) {
+               return EPERM;
+       }
+       return 0;

 }
 #endif /* CONFIG_CODE_DECRYPTION */
 }
 #endif /* CONFIG_CODE_DECRYPTION */