]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/kern/mach_loader.c
xnu-3248.60.10.tar.gz
[apple/xnu.git] / bsd / kern / mach_loader.c
index 5f10965a1b2b6d86c423d2dfd6f74644ba5cb4f9..d4f084e31169a178eb71f03042774388db6e6ea1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2010 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
 #include <sys/fcntl.h>
 #include <sys/ubc_internal.h>
 #include <sys/imgact.h>
+#include <sys/codesign.h>
 
 #include <mach/mach_types.h>
 #include <mach/vm_map.h>       /* vm_allocate() */
 #include <mach/mach_vm.h>      /* mach_vm_allocate() */
 #include <mach/vm_statistics.h>
-#include <mach/shared_memory_server.h>
 #include <mach/task.h>
 #include <mach/thread_act.h>
 
 #include <machine/vmparam.h>
+#include <machine/exec.h>
+#include <machine/pal_routines.h>
 
 #include <kern/kern_types.h>
 #include <kern/cpu_number.h>
 #include <kern/mach_loader.h>
+#include <kern/mach_fat.h>
 #include <kern/kalloc.h>
 #include <kern/task.h>
 #include <kern/thread.h>
+#include <kern/page_decrypt.h>
 
 #include <mach-o/fat.h>
 #include <mach-o/loader.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_pager.h>
 #include <vm/vnode_pager.h>
-#include <vm/vm_shared_memory_server.h>
 #include <vm/vm_protos.h> 
+#include <IOKit/IOReturn.h>    /* for kIOReturnNotPrivileged */
 
-/*
- * XXX vm/pmap.h should not treat these prototypes as MACH_KERNEL_PRIVATE
- * when KERNEL is defined.
- */
-extern pmap_t  pmap_create(vm_map_size_t size);
-extern void    pmap_switch(pmap_t);
-extern void    pmap_map_sharedpage(task_t task, pmap_t pmap);
+#include <os/overflow.h>
 
 /*
- * XXX kern/thread.h should not treat these prototypes as MACH_KERNEL_PRIVATE
+ * XXX vm/pmap.h should not treat these prototypes as MACH_KERNEL_PRIVATE
  * when KERNEL is defined.
  */
-extern kern_return_t   thread_setstatus(thread_t thread, int flavor,
-                               thread_state_t tstate,
-                               mach_msg_type_number_t count);
-
-extern kern_return_t    thread_state_initialize(thread_t thread);
-
+extern pmap_t  pmap_create(ledger_t ledger, vm_map_size_t size,
+                               boolean_t is_64bit);
 
 /* XXX should have prototypes in a shared header file */
-extern int grade_binary(cpu_type_t exectype, cpu_subtype_t execsubtype);
 extern int     get_map_nentries(vm_map_t);
-extern kern_return_t   thread_userstack(thread_t, int, thread_state_t,
-                               unsigned int, mach_vm_offset_t *, int *);
-extern kern_return_t   thread_entrypoint(thread_t, int, thread_state_t,
-                               unsigned int, mach_vm_offset_t *);
 
+extern kern_return_t   memory_object_signed(memory_object_control_t control,
+                                            boolean_t is_signed);
 
 /* An empty load_result_t */
 static load_result_t load_result_null = {
-       MACH_VM_MIN_ADDRESS,
-       MACH_VM_MIN_ADDRESS,
-       MACH_VM_MIN_ADDRESS,
-       0,
-       0,
-       0,
-       0
+       .mach_header = MACH_VM_MIN_ADDRESS,
+       .entry_point = MACH_VM_MIN_ADDRESS,
+       .user_stack = MACH_VM_MIN_ADDRESS,
+       .user_stack_size = 0,
+       .all_image_info_addr = MACH_VM_MIN_ADDRESS,
+       .all_image_info_size = 0,
+       .thread_count = 0,
+       .unixproc = 0,
+       .dynlinker = 0,
+       .needs_dynlinker = 0,
+       .prog_allocated_stack = 0,
+       .prog_stack_size = 0,
+       .validentry = 0,
+       .using_lcmain = 0,
+       .csflags = 0,
+       .has_pagezero = 0,
+       .uuid = { 0 },
+       .min_vm_addr = MACH_VM_MAX_ADDRESS,
+       .max_vm_addr = MACH_VM_MIN_ADDRESS,
+       .cs_end_offset = 0,
+       .threadstate = NULL,
+       .threadstate_sz = 0
 };
 
 /*
@@ -124,64 +130,88 @@ static load_return_t
 parse_machfile(
        struct vnode            *vp,
        vm_map_t                map,
-       thread_t                thr_act,
+       thread_t                thread,
        struct mach_header      *header,
        off_t                   file_offset,
        off_t                   macho_size,
-       boolean_t               shared_regions,
-       boolean_t               clean_regions,
        int                     depth,
+       int64_t                 slide,
+       int64_t                 dyld_slide,     
        load_result_t           *result
 );
 
 static load_return_t
 load_segment(
-       struct segment_command  *scp,
-       void *                                  pager,
+       struct load_command             *lcp,
+       uint32_t                        filetype,
+       void                            *control,
        off_t                           pager_offset,
        off_t                           macho_size,
-       off_t                           end_of_file,
-       vm_map_t                                map,
+       struct vnode                    *vp,
+       vm_map_t                        map,
+       int64_t                         slide,
        load_result_t                   *result
 );
 
 static load_return_t
-load_segment_64(
-       struct segment_command_64       *scp64,
-       void                            *pager,
-       off_t                           pager_offset,
-       off_t                           macho_size,
-       off_t                           end_of_file,
-       vm_map_t                        map,
+load_uuid(
+       struct uuid_command             *uulp,
+       char                            *command_end,
        load_result_t                   *result
 );
 
 static load_return_t
-load_unixthread(
-       struct thread_command   *tcp,
-       thread_t                        thr_act,
-       load_result_t                   *result
+load_code_signature(
+       struct linkedit_data_command    *lcp,
+       struct vnode                    *vp,
+       off_t                           macho_offset,
+       off_t                           macho_size,
+       cpu_type_t                      cputype,
+       load_result_t                   *result);
+       
+#if CONFIG_CODE_DECRYPTION
+static load_return_t
+set_code_unprotect(
+       struct encryption_info_command  *lcp,
+       caddr_t                         addr,
+       vm_map_t                        map,
+       int64_t                         slide,
+       struct vnode                    *vp,
+       off_t                           macho_offset,
+       cpu_type_t                      cputype,
+       cpu_subtype_t                   cpusubtype);
+#endif
+
+static
+load_return_t
+load_main(
+       struct entry_point_command      *epc,
+       thread_t                thread,
+       int64_t                         slide,
+       load_result_t           *result
 );
 
 static load_return_t
-load_thread(
+load_unixthread(
        struct thread_command   *tcp,
-       thread_t                        thr_act,
+       thread_t                        thread,
+       int64_t                         slide,
        load_result_t                   *result
 );
 
 static load_return_t
 load_threadstate(
        thread_t                thread,
-       unsigned long   *ts,
-       unsigned long   total_size
+       uint32_t        *ts,
+       uint32_t        total_size,
+       load_result_t *
 );
 
 static load_return_t
 load_threadstack(
        thread_t                thread,
-       unsigned long   *ts,
-       unsigned long   total_size,
+       uint32_t        *ts,
+       uint32_t        total_size,
        mach_vm_offset_t        *user_stack,
        int                             *customstack
 );
@@ -189,8 +219,8 @@ load_threadstack(
 static load_return_t
 load_threadentry(
        thread_t                thread,
-       unsigned long   *ts,
-       unsigned long   total_size,
+       uint32_t        *ts,
+       uint32_t        total_size,
        mach_vm_offset_t        *entry_point
 );
 
@@ -199,12 +229,14 @@ load_dylinker(
        struct dylinker_command *lcp,
        integer_t               archbits,
        vm_map_t                                map,
-       thread_t                        thr_act,
+       thread_t                        thread,
        int                                             depth,
-       load_result_t                   *result,
-       boolean_t                       clean_regions
+       int64_t                 slide,
+       load_result_t                   *result
 );
 
+struct macho_data;
+
 static load_return_t
 get_macho_vnode(
        char                            *path,
@@ -212,57 +244,163 @@ get_macho_vnode(
        struct mach_header      *mach_header,
        off_t                   *file_offset,
        off_t                   *macho_size,
+       struct macho_data       *macho_data,
        struct vnode            **vpp
 );
 
+static inline void
+widen_segment_command(const struct segment_command *scp32,
+    struct segment_command_64 *scp)
+{
+       scp->cmd = scp32->cmd;
+       scp->cmdsize = scp32->cmdsize;
+       bcopy(scp32->segname, scp->segname, sizeof(scp->segname));
+       scp->vmaddr = scp32->vmaddr;
+       scp->vmsize = scp32->vmsize;
+       scp->fileoff = scp32->fileoff;
+       scp->filesize = scp32->filesize;
+       scp->maxprot = scp32->maxprot;
+       scp->initprot = scp32->initprot;
+       scp->nsects = scp32->nsects;
+       scp->flags = scp32->flags;
+}
+
+static void
+note_all_image_info_section(const struct segment_command_64 *scp,
+    boolean_t is64, size_t section_size, const void *sections,
+    int64_t slide, load_result_t *result)
+{
+       const union {
+               struct section s32;
+               struct section_64 s64;
+       } *sectionp;
+       unsigned int i;
+
+       if (strncmp(scp->segname, "__DATA", sizeof(scp->segname)) != 0)
+               return;
+       for (i = 0; i < scp->nsects; ++i) {
+               sectionp = (const void *)
+                   ((const char *)sections + section_size * i);
+               if (0 == strncmp(sectionp->s64.sectname, "__all_image_info",
+                   sizeof(sectionp->s64.sectname))) {
+                       result->all_image_info_addr =
+                           is64 ? sectionp->s64.addr : sectionp->s32.addr;
+                       result->all_image_info_addr += slide;
+                       result->all_image_info_size =
+                           is64 ? sectionp->s64.size : sectionp->s32.size;
+                       return;
+               }
+       }
+}
+
+
 load_return_t
 load_machfile(
        struct image_params     *imgp,
        struct mach_header      *header,
-       thread_t                thr_act,
-       vm_map_t                new_map,
-       boolean_t               clean_regions,
+       thread_t                thread,
+       vm_map_t                *mapp,
        load_result_t           *result
 )
 {
        struct vnode            *vp = imgp->ip_vp;
        off_t                   file_offset = imgp->ip_arch_offset;
        off_t                   macho_size = imgp->ip_arch_size;
-       
+       off_t                   file_size = imgp->ip_vattr->va_data_size;
+       vm_map_t                new_map = *mapp;
        pmap_t                  pmap = 0;       /* protected by create_map */
        vm_map_t                map;
-       vm_map_t                old_map;
        load_result_t           myresult;
        load_return_t           lret;
-       boolean_t create_map = TRUE;
+       boolean_t create_map = FALSE;
+       boolean_t enforce_hard_pagezero = TRUE;
+       int spawn = (imgp->ip_flags & IMGPF_SPAWN);
+       task_t task = current_task();
+       proc_t p = current_proc();
+       mach_vm_offset_t        aslr_offset = 0;
+       mach_vm_offset_t        dyld_aslr_offset = 0;
+       kern_return_t           kret;
+
+       if (macho_size > file_size) {
+               return(LOAD_BADMACHO);
+       }
+
+       if (new_map == VM_MAP_NULL) {
+               create_map = TRUE;
+       }
 
-       if (new_map != VM_MAP_NULL) {
-               create_map = FALSE;
+       /*
+        * If we are spawning, we have created backing objects for the process
+        * already, which include non-lazily creating the task map.  So we
+        * are going to switch out the task map with one appropriate for the
+        * bitness of the image being loaded.
+        */
+       if (spawn) {
+               create_map = TRUE;
        }
 
        if (create_map) {
-               old_map = current_map();
-#ifdef i386
-               pmap = get_task_pmap(current_task());
-               pmap_reference(pmap);
-#else
-               pmap = pmap_create((vm_map_size_t) 0);
-#endif
+               task_t ledger_task;
+               if (imgp->ip_new_thread) {
+                       ledger_task = get_threadtask(imgp->ip_new_thread);
+               } else {
+                       ledger_task = task;
+               }
+               pmap = pmap_create(get_task_ledger(ledger_task),
+                                  (vm_map_size_t) 0,
+                                  ((imgp->ip_flags & IMGPF_IS_64BIT) != 0));
+               pal_switch_pmap(thread, pmap, imgp->ip_flags & IMGPF_IS_64BIT);
                map = vm_map_create(pmap,
-                               get_map_min(old_map),
-                               get_map_max(old_map),
-                               TRUE); /**** FIXME ****/
+                               0,
+                               vm_compute_max_offset(((imgp->ip_flags & IMGPF_IS_64BIT) == IMGPF_IS_64BIT)),
+                               TRUE);
        } else
                map = new_map;
-               
+
+#if   (__ARM_ARCH_7K__ >= 2) && defined(PLATFORM_WatchOS)
+       /* enforce 16KB alignment for watch targets with new ABI */
+       vm_map_set_page_shift(map, SIXTEENK_PAGE_SHIFT);
+#endif /* __arm64__ */
+
+#ifndef        CONFIG_ENFORCE_SIGNED_CODE
+       /* This turns off faulting for executable pages, which allows
+        * to circumvent Code Signing Enforcement. The per process
+        * flag (CS_ENFORCEMENT) is not set yet, but we can use the
+        * global flag.
+        */
+       if ( !cs_enforcement(NULL) && (header->flags & MH_ALLOW_STACK_EXECUTION) )
+               vm_map_disable_NX(map);
+#endif
+
+       /* Forcibly disallow execution from data pages on even if the arch
+        * normally permits it. */
+       if ((header->flags & MH_NO_HEAP_EXECUTION) && !(imgp->ip_flags & IMGPF_ALLOW_DATA_EXEC))
+               vm_map_disallow_data_exec(map);
+       
+       /*
+        * Compute a random offset for ASLR, and an independent random offset for dyld.
+        */
+       if (!(imgp->ip_flags & IMGPF_DISABLE_ASLR)) {
+               uint64_t max_slide_pages;
+
+               max_slide_pages = vm_map_get_max_aslr_slide_pages(map);
+
+               aslr_offset = random();
+               aslr_offset %= max_slide_pages;
+               aslr_offset <<= vm_map_page_shift(map);
+
+               dyld_aslr_offset = random();
+               dyld_aslr_offset %= max_slide_pages;
+               dyld_aslr_offset <<= vm_map_page_shift(map);
+       }
+       
        if (!result)
                result = &myresult;
 
        *result = load_result_null;
 
-       lret = parse_machfile(vp, map, thr_act, header, file_offset, macho_size,
-                             ((imgp->ip_flags & IMGPF_IS_64BIT) == 0), /* shared regions? */
-                             clean_regions, 0, result);
+       lret = parse_machfile(vp, map, thread, header, file_offset, macho_size,
+                             0, (int64_t)aslr_offset, (int64_t)dyld_aslr_offset, result);
 
        if (lret != LOAD_SUCCESS) {
                if (create_map) {
@@ -271,30 +409,77 @@ load_machfile(
                return(lret);
        }
 
+#if __x86_64__
        /*
-        *      Commit to new map.  First make sure that the current
-        *      users of the task get done with it, and that we clean
-        *      up the old contents of IPC and memory.  The task is
-        *      guaranteed to be single threaded upon return (us).
-        *
-        *      Swap the new map for the old, which  consumes our new map
-        *      reference but each leaves us responsible for the old_map reference.
-        *      That lets us get off the pmap associated with it, and
-        *      then we can release it.
+        * On x86, for compatibility, don't enforce the hard page-zero restriction for 32-bit binaries.
         */
-        if (create_map) {
-               task_halt(current_task());
-
-               old_map = swap_task_map(current_task(), map);
-#ifndef i386
-               pmap_switch(pmap);      /* Make sure we are using the new pmap */
+       if ((imgp->ip_flags & IMGPF_IS_64BIT) == 0) {
+               enforce_hard_pagezero = FALSE;
+       }
 #endif
-               vm_map_deallocate(old_map);
+       /*
+        * Check to see if the page zero is enforced by the map->min_offset.
+        */ 
+       if (enforce_hard_pagezero &&
+           (vm_map_has_hard_pagezero(map, 0x1000) == FALSE)) {
+               {
+                       if (create_map) {
+                               vm_map_deallocate(map); /* will lose pmap reference too */
+                       }
+                       return (LOAD_BADMACHO);
+               }
+       }
+
+       if (create_map) {
+               /*
+                * If this is an exec, then we are going to destroy the old
+                * task, and it's correct to halt it; if it's spawn, the
+                * task is not yet running, and it makes no sense.
+                */
+               if (!spawn) {
+                       /*
+                        * Mark the task as halting and start the other
+                        * threads towards terminating themselves.  Then
+                        * make sure any threads waiting for a process
+                        * transition get informed that we are committed to
+                        * this transition, and then finally complete the
+                        * task halting (wait for threads and then cleanup
+                        * task resources).
+                        *
+                        * NOTE: task_start_halt() makes sure that no new
+                        * threads are created in the task during the transition.
+                        * We need to mark the workqueue as exiting before we
+                        * wait for threads to terminate (at the end of which
+                        * we no longer have a prohibition on thread creation).
+                        * 
+                        * Finally, clean up any lingering workqueue data structures
+                        * that may have been left behind by the workqueue threads
+                        * as they exited (and then clean up the work queue itself).
+                        */
+                       kret = task_start_halt(task);
+                       if (kret != KERN_SUCCESS) {
+                               vm_map_deallocate(map); /* will lose pmap reference too */
+                               return (LOAD_FAILURE);
+                       }
+                       proc_transcommit(p, 0);
+                       workqueue_mark_exiting(p);
+                       task_complete_halt(task);
+                       workqueue_exit(p);
+                       kqueue_dealloc(p->p_wqkqueue);
+                       p->p_wqkqueue = NULL;
+               }
+               *mapp = map;
        }
        return(LOAD_SUCCESS);
 }
 
-int    dylink_test = 1;
+int macho_printf = 0;
+#define MACHO_PRINTF(args)                             \
+       do {                                            \
+               if (macho_printf) {                     \
+                       printf args;                    \
+               }                                       \
+       } while (0)
 
 /*
  * The file size of a mach-o file is limited to 32 bits; this is because
@@ -303,20 +488,22 @@ int       dylink_test = 1;
  * bits in the file format itself.  We read into the kernel buffer the
  * commands section, and then parse it in order to parse the mach-o file
  * format load_command segment(s).  We are only interested in a subset of
- * the total set of possible commands.
+ * the total set of possible commands. If "map"==VM_MAP_NULL or
+ * "thread"==THREAD_NULL, do not make permament VM modifications,
+ * just preflight the parse.
  */
 static
 load_return_t
 parse_machfile(
        struct vnode            *vp,       
        vm_map_t                map,
-       thread_t                thr_act,
+       thread_t                thread,
        struct mach_header      *header,
        off_t                   file_offset,
        off_t                   macho_size,
-       boolean_t               shared_regions,
-       boolean_t               clean_regions,
        int                     depth,
+       int64_t                 aslr_offset,
+       int64_t                 dyld_aslr_offset,
        load_result_t           *result
 )
 {
@@ -324,7 +511,7 @@ parse_machfile(
        struct load_command     *lcp;
        struct dylinker_command *dlp = 0;
        integer_t               dlarchbits = 0;
-       void *                  pager;
+       void *                  control;
        load_return_t           ret = LOAD_SUCCESS;
        caddr_t                 addr;
        void *                  kl_addr;
@@ -332,12 +519,13 @@ parse_machfile(
        size_t                  offset;
        size_t                  oldoffset;      /* for overflow check */
        int                     pass;
-       struct proc *p = current_proc();                /* XXXX */
+       proc_t                  p = current_proc();             /* XXXX */
        int                     error;
-       int resid=0;
-       task_t task;
+       int                     resid = 0;
        size_t                  mach_header_sz = sizeof(struct mach_header);
        boolean_t               abi64;
+       boolean_t               got_code_signatures = FALSE;
+       int64_t                 slide = 0;
 
        if (header->magic == MH_MAGIC_64 ||
            header->magic == MH_CIGAM_64) {
@@ -347,40 +535,34 @@ parse_machfile(
        /*
         *      Break infinite recursion
         */
-       if (depth > 6)
+       if (depth > 1) {
                return(LOAD_FAILURE);
-
-       task = (task_t)get_threadtask(thr_act);
+       }
 
        depth++;
 
        /*
         *      Check to see if right machine type.
         */
-       if (((cpu_type_t)(header->cputype & ~CPU_ARCH_MASK) != cpu_type()) ||
-           !grade_binary(header->cputype, header->cpusubtype))
+       if (((cpu_type_t)(header->cputype & ~CPU_ARCH_MASK) != (cpu_type() & ~CPU_ARCH_MASK)) ||
+           !grade_binary(header->cputype, 
+               header->cpusubtype & ~CPU_SUBTYPE_MASK))
                return(LOAD_BADARCH);
                
        abi64 = ((header->cputype & CPU_ARCH_ABI64) == CPU_ARCH_ABI64);
                
        switch (header->filetype) {
        
-       case MH_OBJECT:
        case MH_EXECUTE:
-       case MH_PRELOAD:
-               if (depth != 1)
+               if (depth != 1) {
                        return (LOAD_FAILURE);
-               break;
-               
-       case MH_FVMLIB:
-       case MH_DYLIB:
-               if (depth == 1)
-                       return (LOAD_FAILURE);
-               break;
+               }
 
+               break;
        case MH_DYLINKER:
-               if (depth != 2)
+               if (depth != 2) {
                        return (LOAD_FAILURE);
+               }
                break;
                
        default:
@@ -390,14 +572,13 @@ parse_machfile(
        /*
         *      Get the pager for the file.
         */
-       UBCINFOCHECK("parse_machfile", vp);
-       pager = (void *) ubc_getpager(vp);
+       control = ubc_getobject(vp, UBC_FLAGS_NONE);
 
        /*
         *      Map portion that must be accessible directly into
         *      kernel's map.
         */
-       if ((mach_header_sz + header->sizeofcmds) > macho_size)
+       if ((off_t)(mach_header_sz + header->sizeofcmds) > macho_size)
                return(LOAD_BADMACHO);
 
        /*
@@ -418,18 +599,54 @@ parse_machfile(
                return(LOAD_NOSPACE);
 
        error = vn_rdwr(UIO_READ, vp, addr, size, file_offset,
-           UIO_SYSSPACE32, 0, kauth_cred_get(), &resid, p);
+           UIO_SYSSPACE, 0, kauth_cred_get(), &resid, p);
        if (error) {
-               if (kl_addr )
+               if (kl_addr)
                        kfree(kl_addr, kl_size);
                return(LOAD_IOERROR);
        }
-       /* (void)ubc_map(vp, PROT_EXEC); */ /* NOT HERE */
-       
+
+       if (resid) {
+               /* We must be able to read in as much as the mach_header indicated */
+               if (kl_addr)
+                       kfree(kl_addr, kl_size);
+               return(LOAD_BADMACHO);
+       }
+
        /*
-        *      Scan through the commands, processing each one as necessary.
+        *      For PIE and dyld, slide everything by the ASLR offset.
+        */
+       if ((header->flags & MH_PIE) || (header->filetype == MH_DYLINKER)) {
+               slide = aslr_offset;
+       }
+
+        /*
+        *  Scan through the commands, processing each one as necessary.
+        *  We parse in three passes through the headers:
+        *  0: determine if TEXT and DATA boundary can be page-aligned
+        *  1: thread state, uuid, code signature
+        *  2: segments
+        *  3: dyld, encryption, check entry point
         */
-       for (pass = 1; pass <= 2; pass++) {
+       
+       for (pass = 0; pass <= 3; pass++) {
+
+               if (pass == 0) {
+                       /* see if we need to adjust the slide to re-align... */
+                       /* no re-alignment needed on X86_64 or ARM32 kernel */
+                       continue;
+               } else if (pass == 1) {
+               }
+
+               /*
+                * Check that the entry point is contained in an executable segments
+                */ 
+               if ((pass == 3) && (!result->using_lcmain && result->validentry == 0)) {
+                       thread_state_initialize(thread);
+                       ret = LOAD_FAILURE;
+                       break;
+               }
+
                /*
                 * Loop through each of the load_commands indicated by the
                 * Mach-O header; if an absurd value is provided, we just
@@ -438,6 +655,7 @@ parse_machfile(
                 */
                offset = mach_header_sz;
                ncmds = header->ncmds;
+
                while (ncmds--) {
                        /*
                         *      Get a pointer to the command.
@@ -466,47 +684,78 @@ parse_machfile(
                         * intervention is required.
                         */
                        switch(lcp->cmd) {
-                       case LC_SEGMENT_64:
-                               if (pass != 1)
-                                       break;
-                               ret = load_segment_64(
-                                              (struct segment_command_64 *)lcp,
-                                                  pager,
-                                                  file_offset,
-                                                  macho_size,
-                                                  ubc_getsize(vp),
-                                                  map,
-                                                  result);
-                               break;
                        case LC_SEGMENT:
-                               if (pass != 1)
+                               if (pass == 0) {
+                                       break;
+                               }
+
+                               if (pass != 2)
+                                       break;
+
+                               if (abi64) {
+                                       /*
+                                        * Having an LC_SEGMENT command for the
+                                        * wrong ABI is invalid <rdar://problem/11021230>
+                                        */
+                                       ret = LOAD_BADMACHO;
                                        break;
-                               ret = load_segment(
-                                              (struct segment_command *) lcp,
-                                                  pager,
-                                                  file_offset,
-                                                  macho_size,
-                                                  ubc_getsize(vp),
-                                                  map,
-                                                  result);
+                               }
+
+                               ret = load_segment(lcp,
+                                                  header->filetype,
+                                                  control,
+                                                  file_offset,
+                                                  macho_size,
+                                                  vp,
+                                                  map,
+                                                  slide,
+                                                  result);
                                break;
-                       case LC_THREAD:
+                       case LC_SEGMENT_64:
                                if (pass != 2)
                                        break;
-                               ret = load_thread((struct thread_command *)lcp,
-                                                  thr_act,
-                                                 result);
+
+                               if (!abi64) {
+                                       /*
+                                        * Having an LC_SEGMENT_64 command for the
+                                        * wrong ABI is invalid <rdar://problem/11021230>
+                                        */
+                                       ret = LOAD_BADMACHO;
+                                       break;
+                               }
+
+                               ret = load_segment(lcp,
+                                                  header->filetype,
+                                                  control,
+                                                  file_offset,
+                                                  macho_size,
+                                                  vp,
+                                                  map,
+                                                  slide,
+                                                  result);
                                break;
                        case LC_UNIXTHREAD:
-                               if (pass != 2)
+                               if (pass != 1)
                                        break;
                                ret = load_unixthread(
                                                 (struct thread_command *) lcp,
-                                                  thr_act,
+                                                thread,
+                                                slide,
+                                                result);
+                               break;
+                       case LC_MAIN:
+                               if (pass != 1)
+                                       break;
+                               if (depth != 1)
+                                       break;
+                               ret = load_main(
+                                                (struct entry_point_command *) lcp,
+                                                thread,
+                                                slide,
                                                 result);
                                break;
                        case LC_LOAD_DYLINKER:
-                               if (pass != 2)
+                               if (pass != 3)
                                        break;
                                if ((depth == 1) && (dlp == 0)) {
                                        dlp = (struct dylinker_command *)lcp;
@@ -515,6 +764,105 @@ parse_machfile(
                                        ret = LOAD_FAILURE;
                                }
                                break;
+                       case LC_UUID:
+                               if (pass == 1 && depth == 1) {
+                                       ret = load_uuid((struct uuid_command *) lcp,
+                                                       (char *)addr + mach_header_sz + header->sizeofcmds,
+                                                       result);
+                               }
+                               break;
+                       case LC_CODE_SIGNATURE:
+                               /* CODE SIGNING */
+                               if (pass != 1)
+                                       break;
+                               /* pager -> uip ->
+                                  load signatures & store in uip
+                                  set VM object "signed_pages"
+                               */
+                               ret = load_code_signature(
+                                       (struct linkedit_data_command *) lcp,
+                                       vp,
+                                       file_offset,
+                                       macho_size,
+                                       header->cputype,
+                                       result);
+                               if (ret != LOAD_SUCCESS) {
+                                       printf("proc %d: load code signature error %d "
+                                              "for file \"%s\"\n",
+                                              p->p_pid, ret, vp->v_name);
+                                       /*
+                                        * Allow injections to be ignored on devices w/o enforcement enabled
+                                        */
+                                       if (!cs_enforcement(NULL))
+                                           ret = LOAD_SUCCESS; /* ignore error */
+
+                               } else {
+                                       got_code_signatures = TRUE;
+                               }
+
+                               if (got_code_signatures) {
+                                       unsigned tainted = CS_VALIDATE_TAINTED;
+                                       boolean_t valid = FALSE;
+                                       struct cs_blob *blobs;
+                                       vm_size_t off = 0;
+
+
+                                       if (cs_debug > 10)
+                                               printf("validating initial pages of %s\n", vp->v_name);
+                                       blobs = ubc_get_cs_blobs(vp);
+                                       
+                                       while (off < size && ret == LOAD_SUCCESS) {
+                                            tainted = CS_VALIDATE_TAINTED;
+
+                                            valid = cs_validate_page(blobs,
+                                                                     NULL,
+                                                                     file_offset + off,
+                                                                     addr + off,
+                                                                     &tainted);
+                                            if (!valid || (tainted & CS_VALIDATE_TAINTED)) {
+                                                    if (cs_debug)
+                                                            printf("CODE SIGNING: %s[%d]: invalid initial page at offset %lld validated:%d tainted:%d csflags:0x%x\n", 
+                                                                   vp->v_name, p->p_pid, (long long)(file_offset + off), valid, tainted, result->csflags);
+                                                    if (cs_enforcement(NULL) ||
+                                                        (result->csflags & (CS_HARD|CS_KILL|CS_ENFORCEMENT))) {
+                                                            ret = LOAD_FAILURE;
+                                                    }
+                                                    result->csflags &= ~CS_VALID;
+                                            }
+                                            off += PAGE_SIZE;
+                                       }
+                               }
+
+                               break;
+#if CONFIG_CODE_DECRYPTION
+                       case LC_ENCRYPTION_INFO:
+                       case LC_ENCRYPTION_INFO_64:
+                               if (pass != 3)
+                                       break;
+                               ret = set_code_unprotect(
+                                       (struct encryption_info_command *) lcp,
+                                       addr, map, slide, vp, file_offset,
+                                       header->cputype, header->cpusubtype);
+                               if (ret != LOAD_SUCCESS) {
+                                       printf("proc %d: set_code_unprotect() error %d "
+                                              "for file \"%s\"\n",
+                                              p->p_pid, ret, vp->v_name);
+                                       /* 
+                                        * Don't let the app run if it's 
+                                        * encrypted but we failed to set up the
+                                        * decrypter. If the keys are missing it will
+                                        * return LOAD_DECRYPTFAIL.
+                                        */
+                                        if (ret == LOAD_DECRYPTFAIL) {
+                                               /* failed to load due to missing FP keys */
+                                               proc_lock(p);
+                                               p->p_lflag |= P_LTERM_DECRYPTFAIL;
+                                               proc_unlock(p);
+                                        }
+                                        psignal(p, SIGKILL);
+                               }
+                               break;
+#endif
                        default:
                                /* Other commands are ignored by the kernel */
                                ret = LOAD_SUCCESS;
@@ -526,205 +874,504 @@ parse_machfile(
                if (ret != LOAD_SUCCESS)
                        break;
        }
-       if (ret == LOAD_SUCCESS) { 
 
-           if (shared_regions) {
-               vm_offset_t vmaddr;
-               shared_region_mapping_t shared_region;
-               struct shared_region_task_mappings      map_info;
-               shared_region_mapping_t next;
-
-RedoLookup:
-               vm_get_shared_region(task, &shared_region);
-               map_info.self = (vm_offset_t)shared_region;
-               shared_region_mapping_info(shared_region,
-                       &(map_info.text_region),   
-                       &(map_info.text_size),
-                       &(map_info.data_region),
-                       &(map_info.data_size),
-                       &(map_info.region_mappings),
-                       &(map_info.client_base),
-                       &(map_info.alternate_base),
-                       &(map_info.alternate_next), 
-                       &(map_info.fs_base),
-                       &(map_info.system),
-                       &(map_info.flags), &next);
-
-               if((map_info.flags & SHARED_REGION_FULL) ||
-                       (map_info.flags & SHARED_REGION_STALE)) {
-                       shared_region_mapping_t system_region;
-                       system_region = lookup_default_shared_region(
-                               map_info.fs_base, map_info.system);
-                       if((map_info.self != (vm_offset_t)system_region) &&
-                               (map_info.flags & SHARED_REGION_SYSTEM)) {
-                          if(system_region == NULL) {
-                               shared_file_boot_time_init(
-                                       map_info.fs_base, map_info.system);
-                          } else {
-                               vm_set_shared_region(task, system_region);
-                          }
-                          shared_region_mapping_dealloc(
-                                       (shared_region_mapping_t)map_info.self);
-                          goto RedoLookup;
-                       } else if (map_info.flags & SHARED_REGION_SYSTEM) {
-                             shared_region_mapping_dealloc(system_region);
-                             shared_file_boot_time_init(
-                                       map_info.fs_base, map_info.system);
-                             shared_region_mapping_dealloc(
-                                    (shared_region_mapping_t)map_info.self);
+       if (ret == LOAD_SUCCESS) { 
+               if (! got_code_signatures) {
+                       if (cs_enforcement(NULL)) {
+                               ret = LOAD_FAILURE;
                        } else {
-                             shared_region_mapping_dealloc(system_region);
+                               /*
+                                * No embedded signatures: look for detached by taskgated,
+                                * this is only done on OSX, on embedded platforms we expect everything
+                                * to be have embedded signatures.
+                                */
+                               struct cs_blob *blob;
+
+                               blob = ubc_cs_blob_get(vp, -1, file_offset);
+                               if (blob != NULL) {
+                                       unsigned int cs_flag_data = blob->csb_flags;
+                                       if(0 != ubc_cs_generation_check(vp)) {
+                                               if (0 != ubc_cs_blob_revalidate(vp, blob, 0)) {
+                                                       /* clear out the flag data if revalidation fails */
+                                                       cs_flag_data = 0;
+                                                       result->csflags &= ~CS_VALID;
+                                               }
+                                       }
+                                       /* get flags to be applied to the process */
+                                       result->csflags |= cs_flag_data;
+                               }
                        }
                }
 
-               if (dylink_test) {
-                       p->p_flag |=  P_NOSHLIB; /* no shlibs in use */
-                       vmaddr = map_info.client_base;
-                       if(clean_regions) {
-                          vm_map(map, &vmaddr, map_info.text_size, 
-                               0, SHARED_LIB_ALIAS|VM_FLAGS_FIXED,
-                               map_info.text_region, 0, FALSE,
-                               VM_PROT_READ, VM_PROT_READ, VM_INHERIT_SHARE);
-                       } else {
-                          vm_map(map, &vmaddr, map_info.text_size, 0, 
-                               (VM_MEMORY_SHARED_PMAP << 24) 
-                                 | SHARED_LIB_ALIAS | VM_FLAGS_FIXED,
-                               map_info.text_region, 0, FALSE,
-                               VM_PROT_READ, VM_PROT_READ, VM_INHERIT_SHARE);
-                       }
-                       vmaddr = map_info.client_base + map_info.text_size;
-                       vm_map(map, &vmaddr, map_info.data_size, 
-                               0, SHARED_LIB_ALIAS | VM_FLAGS_FIXED,
-                               map_info.data_region, 0, TRUE,
-                               VM_PROT_READ, VM_PROT_READ, VM_INHERIT_SHARE);
-       
-                       while (next) {
-                          /* this should be fleshed out for the general case */
-                          /* but this is not necessary for now.  Indeed we   */
-                          /* are handling the com page inside of the         */
-                          /* shared_region mapping create calls for now for  */
-                          /* simplicities sake.  If more general support is  */
-                          /* needed the code to manipulate the shared range  */
-                          /* chain can be pulled out and moved to the callers*/
-                          shared_region_mapping_info(next,
-                               &(map_info.text_region),   
-                               &(map_info.text_size),
-                               &(map_info.data_region),
-                               &(map_info.data_size),
-                               &(map_info.region_mappings),
-                               &(map_info.client_base),
-                               &(map_info.alternate_base),
-                               &(map_info.alternate_next), 
-                               &(map_info.fs_base),
-                               &(map_info.system),
-                               &(map_info.flags), &next);
-
-                          vmaddr = map_info.client_base;
-                          vm_map(map, &vmaddr, map_info.text_size, 
-                               0, SHARED_LIB_ALIAS | VM_FLAGS_FIXED,
-                               map_info.text_region, 0, FALSE,
-                               VM_PROT_READ, VM_PROT_READ, VM_INHERIT_SHARE);
-                       }
+               /* Make sure if we need dyld, we got it */
+               if (result->needs_dynlinker && !dlp) {
+                       ret = LOAD_FAILURE;
                }
-            }
-           if (dlp != 0)
-                       ret = load_dylinker(dlp, dlarchbits, map, thr_act, depth, result, clean_regions);
 
-           if(depth == 1) {
-               if (result->thread_count == 0)
-                       ret = LOAD_FAILURE;
-#ifdef __ppc__
-               else if ( abi64 ) {
-                       /* Map in 64-bit commpage */
-                       /* LP64todo - make this clean */
-                       pmap_map_sharedpage(current_task(), get_map_pmap(map));
-                        vm_map_commpage64(map);
+               if ((ret == LOAD_SUCCESS) && (dlp != 0)) {
+                       /*
+                        * load the dylinker, and slide it by the independent DYLD ASLR
+                        * offset regardless of the PIE-ness of the main binary.
+                        */
+                       ret = load_dylinker(dlp, dlarchbits, map, thread, depth,
+                                           dyld_aslr_offset, result);
                }
-#endif
+               
+               if((ret == LOAD_SUCCESS) && (depth == 1)) {
+                       if (result->thread_count == 0) {
+                               ret = LOAD_FAILURE;
+                       }
            }
        }
 
        if (kl_addr )
                kfree(kl_addr, kl_size);
 
-       if (ret == LOAD_SUCCESS)
-               (void)ubc_map(vp, PROT_EXEC);
-               
        return(ret);
 }
 
+#if CONFIG_CODE_DECRYPTION
+
+#define        APPLE_UNPROTECTED_HEADER_SIZE   (3 * 4096)
+
+static load_return_t
+unprotect_dsmos_segment(
+       uint64_t        file_off,
+       uint64_t        file_size,
+       struct vnode    *vp,
+       off_t           macho_offset,
+       vm_map_t        map,
+       vm_map_offset_t map_addr,
+       vm_map_size_t   map_size)
+{
+       kern_return_t   kr;
+
+       /*
+        * The first APPLE_UNPROTECTED_HEADER_SIZE bytes (from offset 0 of
+        * this part of a Universal binary) are not protected...
+        * The rest needs to be "transformed".
+        */
+       if (file_off <= APPLE_UNPROTECTED_HEADER_SIZE &&
+           file_off + file_size <= APPLE_UNPROTECTED_HEADER_SIZE) {
+               /* it's all unprotected, nothing to do... */
+               kr = KERN_SUCCESS;
+       } else {
+               if (file_off <= APPLE_UNPROTECTED_HEADER_SIZE) {
+                       /*
+                        * We start mapping in the unprotected area.
+                        * Skip the unprotected part...
+                        */
+                       vm_map_offset_t delta;
+
+                       delta = APPLE_UNPROTECTED_HEADER_SIZE;
+                       delta -= file_off;
+                       map_addr += delta;
+                       map_size -= delta;
+               }
+               /* ... transform the rest of the mapping. */
+               struct pager_crypt_info crypt_info;
+               crypt_info.page_decrypt = dsmos_page_transform;
+               crypt_info.crypt_ops = NULL;
+               crypt_info.crypt_end = NULL;
+#pragma unused(vp, macho_offset)
+               crypt_info.crypt_ops = (void *)0x2e69cf40;
+               vm_map_offset_t crypto_backing_offset;
+               crypto_backing_offset = -1; /* i.e. use map entry's offset */
+#if DEVELOPMENT || DEBUG
+               struct proc *p;
+               p = current_proc();
+               printf("APPLE_PROTECT: %d[%s] map %p [0x%llx:0x%llx] %s(%s)\n",
+                      p->p_pid, p->p_comm, map,
+                      (uint64_t) map_addr, (uint64_t) (map_addr + map_size),
+                      __FUNCTION__, vp->v_name);
+#endif /* DEVELOPMENT || DEBUG */
+
+               /* The DSMOS pager can only be used by apple signed code */
+               struct cs_blob * blob = csvnode_get_blob(vp, file_off);
+               if( blob == NULL || !blob->csb_platform_binary || blob->csb_platform_path)
+               {
+                       return LOAD_FAILURE;
+               }
+
+               kr = vm_map_apple_protected(map,
+                                           map_addr,
+                                           map_addr + map_size,
+                                           crypto_backing_offset,
+                                           &crypt_info);
+       }
+
+       if (kr != KERN_SUCCESS) {
+               return LOAD_FAILURE;
+       }
+       return LOAD_SUCCESS;
+}
+#else  /* CONFIG_CODE_DECRYPTION */
+static load_return_t
+unprotect_dsmos_segment(
+       __unused        uint64_t        file_off,
+       __unused        uint64_t        file_size,
+       __unused        struct vnode    *vp,
+       __unused        off_t           macho_offset,
+       __unused        vm_map_t        map,
+       __unused        vm_map_offset_t map_addr,
+       __unused        vm_map_size_t   map_size)
+{
+       return LOAD_SUCCESS;
+}
+#endif /* CONFIG_CODE_DECRYPTION */
+
+
+/*
+ * map_segment:
+ *     Maps a Mach-O segment, taking care of mis-alignment (wrt the system
+ *     page size) issues.
+ * 
+ *     The mapping might result in 1, 2 or 3 map entries:
+ *     1. for the first page, which could be overlap with the previous
+ *        mapping,
+ *     2. for the center (if applicable),
+ *     3. for the last page, which could overlap with the next mapping.
+ *
+ *     For each of those map entries, we might have to interpose a
+ *     "fourk_pager" to deal with mis-alignment wrt the system page size,
+ *     either in the mapping address and/or size or the file offset and/or
+ *     size.
+ *     The "fourk_pager" itself would be mapped with proper alignment
+ *     wrt the system page size and would then be populated with the
+ *     information about the intended mapping, with a "4KB" granularity.
+ */
+static kern_return_t
+map_segment(
+       vm_map_t                map,
+       vm_map_offset_t         vm_start,
+       vm_map_offset_t         vm_end,
+       memory_object_control_t control,
+       vm_map_offset_t         file_start,
+       vm_map_offset_t         file_end,
+       vm_prot_t               initprot,
+       vm_prot_t               maxprot)
+{
+       int             extra_vm_flags, cur_extra_vm_flags;
+       vm_map_offset_t cur_offset, cur_start, cur_end;
+       kern_return_t   ret;
+       vm_map_offset_t effective_page_mask;
+       
+       if (vm_end < vm_start ||
+           file_end < file_start) {
+               return LOAD_BADMACHO;
+       }
+       if (vm_end == vm_start ||
+           file_end == file_start) {
+               /* nothing to map... */
+               return LOAD_SUCCESS;
+       }
+
+       effective_page_mask = MAX(PAGE_MASK, vm_map_page_mask(map));
+
+       extra_vm_flags = 0;
+       if (vm_map_page_aligned(vm_start, effective_page_mask) &&
+           vm_map_page_aligned(vm_end, effective_page_mask) &&
+           vm_map_page_aligned(file_start, effective_page_mask) &&
+           vm_map_page_aligned(file_end, effective_page_mask)) {
+               /* all page-aligned and map-aligned: proceed */
+       } else {
+               panic("map_segment: unexpected mis-alignment "
+                     "vm[0x%llx:0x%llx] file[0x%llx:0x%llx]\n",
+                     (uint64_t) vm_start,
+                     (uint64_t) vm_end,
+                     (uint64_t) file_start,
+                     (uint64_t) file_end);
+       }
+
+       cur_offset = 0;
+       cur_start = vm_start;
+       cur_end = vm_start;
+       if (cur_end >= vm_start + (file_end - file_start)) {
+               /* all mapped: done */
+               goto done;
+       }
+       if (vm_map_round_page(cur_end, effective_page_mask) >=
+           vm_map_trunc_page(vm_start + (file_end - file_start),
+                             effective_page_mask)) {
+               /* no middle */
+       } else {
+               cur_start = cur_end;
+               if ((vm_start & effective_page_mask) !=
+                   (file_start & effective_page_mask)) {
+                       /* one 4K pager for the middle */
+                       cur_extra_vm_flags = extra_vm_flags;
+               } else {
+                       /* regular mapping for the middle */
+                       cur_extra_vm_flags = 0;
+               }
+               cur_end = vm_map_trunc_page(vm_start + (file_end -
+                                                       file_start),
+                                           effective_page_mask);
+               if (control != MEMORY_OBJECT_CONTROL_NULL) {
+                       ret = vm_map_enter_mem_object_control(
+                               map,
+                               &cur_start,
+                               cur_end - cur_start,
+                               (mach_vm_offset_t)0,
+                               VM_FLAGS_FIXED | cur_extra_vm_flags,
+                               control,
+                               file_start + cur_offset,
+                               TRUE, /* copy */
+                               initprot, maxprot,
+                               VM_INHERIT_DEFAULT);
+               } else {
+                       ret = vm_map_enter_mem_object(
+                               map,
+                               &cur_start,
+                               cur_end - cur_start,
+                               (mach_vm_offset_t)0,
+                               VM_FLAGS_FIXED | cur_extra_vm_flags,
+                               IPC_PORT_NULL,
+                               0, /* offset */
+                               TRUE, /* copy */
+                               initprot, maxprot,
+                               VM_INHERIT_DEFAULT);
+               }
+               if (ret != KERN_SUCCESS) {
+                       return (LOAD_NOSPACE);
+               }
+               cur_offset += cur_end - cur_start;
+       }
+       if (cur_end >= vm_start + (file_end - file_start)) {
+               /* all mapped: done */
+               goto done;
+       }
+       cur_start = cur_end;
+done:
+       assert(cur_end >= vm_start + (file_end - file_start));
+       return LOAD_SUCCESS;
+}
+
 static
 load_return_t
 load_segment(
-       struct segment_command  *scp,
-       void *                  pager,
+       struct load_command     *lcp,
+       uint32_t                filetype,
+       void *                  control,
        off_t                   pager_offset,
        off_t                   macho_size,
-       __unused off_t          end_of_file,
+       struct vnode            *vp,
        vm_map_t                map,
-       load_result_t           *result
-)
+       int64_t                 slide,
+       load_result_t           *result)
 {
+       struct segment_command_64 segment_command, *scp;
        kern_return_t           ret;
-       vm_offset_t             map_addr, map_offset;
-       vm_size_t               map_size, seg_size, delta_size;
+       vm_map_size_t           delta_size;
        vm_prot_t               initprot;
        vm_prot_t               maxprot;
+       size_t                  segment_command_size, total_section_size,
+                               single_section_size;
+       vm_map_offset_t         file_offset, file_size;
+       vm_map_offset_t         vm_offset, vm_size;
+       vm_map_offset_t         vm_start, vm_end, vm_end_aligned;
+       vm_map_offset_t         file_start, file_end;
+       kern_return_t           kr;
+       boolean_t               verbose;
+       vm_map_size_t           effective_page_size;
+       vm_map_offset_t         effective_page_mask;
+
+       effective_page_size = MAX(PAGE_SIZE, vm_map_page_size(map));
+       effective_page_mask = MAX(PAGE_MASK, vm_map_page_mask(map));
+
+       verbose = FALSE;
+       if (LC_SEGMENT_64 == lcp->cmd) {
+               segment_command_size = sizeof(struct segment_command_64);
+               single_section_size  = sizeof(struct section_64);
+       } else {
+               segment_command_size = sizeof(struct segment_command);
+               single_section_size  = sizeof(struct section);
+       }
+       if (lcp->cmdsize < segment_command_size)
+               return (LOAD_BADMACHO);
+       total_section_size = lcp->cmdsize - segment_command_size;
+
+       if (LC_SEGMENT_64 == lcp->cmd) {
+               scp = (struct segment_command_64 *)lcp;
+       } else {
+               scp = &segment_command;
+               widen_segment_command((struct segment_command *)lcp, scp);
+       }
+
+       if (verbose) {
+               MACHO_PRINTF(("+++ load_segment %s "
+                             "vm[0x%llx:0x%llx] file[0x%llx:0x%llx] "
+                             "prot %d/%d flags 0x%x\n",
+                             scp->segname,
+                             (uint64_t)(slide + scp->vmaddr),
+                             (uint64_t)(slide + scp->vmaddr + scp->vmsize),
+                             pager_offset + scp->fileoff,
+                             pager_offset + scp->fileoff + scp->filesize,
+                             scp->initprot,
+                             scp->maxprot,
+                             scp->flags));
+       }
 
        /*
         * Make sure what we get from the file is really ours (as specified
         * by macho_size).
         */
-       if (scp->fileoff + scp->filesize > macho_size)
+       if (scp->fileoff + scp->filesize < scp->fileoff ||
+           scp->fileoff + scp->filesize > (uint64_t)macho_size) {
                return (LOAD_BADMACHO);
-
-       seg_size = round_page(scp->vmsize);
-       if (seg_size == 0)
-               return(KERN_SUCCESS);
+       }
+       /*
+        * Ensure that the number of sections specified would fit
+        * within the load command size.
+        */
+       if (total_section_size / single_section_size < scp->nsects) {
+               return (LOAD_BADMACHO);
+       }
+       /*
+        * Make sure the segment is page-aligned in the file.
+        */
+       file_offset = pager_offset + scp->fileoff;      /* limited to 32 bits */
+       file_size = scp->filesize;
+       if ((file_offset & PAGE_MASK_64) != 0 ||
+               /* we can't mmap() it if it's not page-aligned in the file */
+           (file_offset & vm_map_page_mask(map)) != 0) {
+               /*
+                * The 1st test would have failed if the system's page size
+                * was what this process believe is the page size, so let's
+                * fail here too for the sake of consistency.
+                */
+               return (LOAD_BADMACHO);
+       }
 
        /*
-        *      Round sizes to page size.
+        * If we have a code signature attached for this slice
+        * require that the segments are within the signed part
+        * of the file.
         */
-       map_size = round_page(scp->filesize);
-       map_addr = trunc_page(scp->vmaddr);
+       if (result->cs_end_offset &&
+           result->cs_end_offset < (off_t)scp->fileoff &&
+           result->cs_end_offset - scp->fileoff < scp->filesize)
+        {
+               if (cs_debug)
+                       printf("section outside code signature\n");
+               return LOAD_BADMACHO;
+       }
+
+       vm_offset = scp->vmaddr + slide;
+       vm_size = scp->vmsize;
+
+       if (vm_size == 0)
+               return (LOAD_SUCCESS);
+       if (scp->vmaddr == 0 &&
+           file_size == 0 &&
+           vm_size != 0 &&
+           (scp->initprot & VM_PROT_ALL) == VM_PROT_NONE &&
+           (scp->maxprot & VM_PROT_ALL) == VM_PROT_NONE) {
+               /*
+                * For PIE, extend page zero rather than moving it.  Extending
+                * page zero keeps early allocations from falling predictably
+                * between the end of page zero and the beginning of the first
+                * slid segment.
+                */
+               /*
+                * This is a "page zero" segment:  it starts at address 0,
+                * is not mapped from the binary file and is not accessible.
+                * User-space should never be able to access that memory, so
+                * make it completely off limits by raising the VM map's
+                * minimum offset.
+                */
+               vm_end = vm_offset + vm_size;
+               if (vm_end < vm_offset) {
+                       return (LOAD_BADMACHO);
+               }
+               if (verbose) {
+                       MACHO_PRINTF(("++++++ load_segment: "
+                                     "page_zero up to 0x%llx\n",
+                                     (uint64_t) vm_end));
+               }
+               {
+                       vm_end = vm_map_round_page(vm_end,
+                                                  PAGE_MASK_64);
+                       vm_end_aligned = vm_end;
+               }
+               ret = vm_map_raise_min_offset(map,
+                                             vm_end_aligned);
+                       
+               if (ret != KERN_SUCCESS) {
+                       return (LOAD_FAILURE);
+               }
+               return (LOAD_SUCCESS);
+       } else {
+       }
+
+       {
+               file_start = vm_map_trunc_page(file_offset,
+                                              effective_page_mask);
+               file_end = vm_map_round_page(file_offset + file_size,
+                                            effective_page_mask);
+               vm_start = vm_map_trunc_page(vm_offset,
+                                            effective_page_mask);
+               vm_end = vm_map_round_page(vm_offset + vm_size,
+                                          effective_page_mask);
+       }
+
+       if (vm_start < result->min_vm_addr)
+               result->min_vm_addr = vm_start;
+       if (vm_end > result->max_vm_addr)
+               result->max_vm_addr = vm_end;
 
-       map_offset = pager_offset + scp->fileoff;
+       if (map == VM_MAP_NULL)
+               return (LOAD_SUCCESS);
 
-       if (map_size > 0) {
+       if (vm_size > 0) {
                initprot = (scp->initprot) & VM_PROT_ALL;
                maxprot = (scp->maxprot) & VM_PROT_ALL;
                /*
                 *      Map a copy of the file into the address space.
                 */
-               ret = vm_map(map,
-                               &map_addr, map_size, (vm_offset_t)0,
-                               VM_FLAGS_FIXED, pager, map_offset, TRUE,
-                               initprot, maxprot,
-                               VM_INHERIT_DEFAULT);
-               if (ret != KERN_SUCCESS)
-                       return(LOAD_NOSPACE);
-       
+               if (verbose) {
+                       MACHO_PRINTF(("++++++ load_segment: "
+                                     "mapping at vm [0x%llx:0x%llx] of "
+                                     "file [0x%llx:0x%llx]\n",
+                                     (uint64_t) vm_start,
+                                     (uint64_t) vm_end,
+                                     (uint64_t) file_start,
+                                     (uint64_t) file_end));
+               }
+               ret = map_segment(map,
+                                 vm_start,
+                                 vm_end,
+                                 control,
+                                 file_start,
+                                 file_end,
+                                 initprot,
+                                 maxprot);
+               if (ret) {
+                       return LOAD_NOSPACE;
+               }
+
+#if FIXME
                /*
                 *      If the file didn't end on a page boundary,
                 *      we need to zero the leftover.
                 */
                delta_size = map_size - scp->filesize;
-#if FIXME
                if (delta_size > 0) {
-                       vm_offset_t     tmp;
+                       mach_vm_offset_t        tmp;
        
-                       ret = vm_allocate(kernel_map, &tmp, delta_size, VM_FLAGS_ANYWHERE);
-                       if (ret != KERN_SUCCESS)
+                       ret = mach_vm_allocate(kernel_map, &tmp, delta_size, VM_FLAGS_ANYWHERE| VM_MAKE_TAG(VM_KERN_MEMORY_BSD));
+                       if (ret != KERN_SUCCESS) {
                                return(LOAD_RESOURCE);
+                       }
        
                        if (copyout(tmp, map_addr + scp->filesize,
                                                                delta_size)) {
-                               (void) vm_deallocate(
+                               (void) mach_vm_deallocate(
                                                kernel_map, tmp, delta_size);
-                               return(LOAD_FAILURE);
+                               return (LOAD_FAILURE);
                        }
-                       
-                       (void) vm_deallocate(kernel_map, tmp, delta_size);
+       
+                       (void) mach_vm_deallocate(kernel_map, tmp, delta_size);
                }
 #endif /* FIXME */
        }
@@ -734,248 +1381,222 @@ load_segment(
         *      than the size from the file, we need to allocate
         *      zero fill memory for the rest.
         */
-       delta_size = seg_size - map_size;
+       if ((vm_end - vm_start) > (file_end - file_start)) {
+               delta_size = (vm_end - vm_start) - (file_end - file_start);
+       } else {
+               delta_size = 0;
+       }
        if (delta_size > 0) {
-               vm_offset_t     tmp = map_addr + map_size;
-
-               ret = vm_allocate(map, &tmp, delta_size, VM_FLAGS_FIXED);
-               if (ret != KERN_SUCCESS)
+               mach_vm_offset_t tmp;
+
+               tmp = vm_start + (file_end - file_start);
+               if (verbose) {
+                       MACHO_PRINTF(("++++++ load_segment: "
+                                     "delta mapping vm [0x%llx:0x%llx]\n",
+                                     (uint64_t) tmp,
+                                     (uint64_t) (tmp + delta_size)));
+               }
+               kr = map_segment(map,
+                                tmp,
+                                tmp + delta_size,
+                                MEMORY_OBJECT_CONTROL_NULL,
+                                0,
+                                delta_size,
+                                scp->initprot,
+                                scp->maxprot);
+               if (kr != KERN_SUCCESS) {
                        return(LOAD_NOSPACE);
+               }
        }
 
-       /*
-        *      Set protection values. (Note: ignore errors!)
-        */
+       if ( (scp->fileoff == 0) && (scp->filesize != 0) )
+               result->mach_header = vm_offset;
+
+       if (scp->flags & SG_PROTECTED_VERSION_1) {
+               ret = unprotect_dsmos_segment(file_start,
+                                             file_end - file_start,
+                                             vp,
+                                             pager_offset,
+                                             map,
+                                             vm_start,
+                                             vm_end - vm_start);
+               if (ret != LOAD_SUCCESS) {
+                       return ret;
+               }
+       } else {
+               ret = LOAD_SUCCESS;
+       }
 
-       if (scp->maxprot != VM_PROT_DEFAULT) {
-               (void) vm_protect(map,
-                                       map_addr, seg_size,
-                                       TRUE, scp->maxprot);
+       if (LOAD_SUCCESS == ret &&
+           filetype == MH_DYLINKER &&
+           result->all_image_info_addr == MACH_VM_MIN_ADDRESS) {
+               note_all_image_info_section(scp,
+                                           LC_SEGMENT_64 == lcp->cmd,
+                                           single_section_size,
+                                           ((const char *)lcp +
+                                            segment_command_size),
+                                           slide,
+                                           result);
        }
-       if (scp->initprot != VM_PROT_DEFAULT) {
-               (void) vm_protect(map,
-                                     map_addr, seg_size,
-                                     FALSE, scp->initprot);
+
+       if (result->entry_point != MACH_VM_MIN_ADDRESS) {
+               if ((result->entry_point >= vm_offset) && (result->entry_point < (vm_offset + vm_size))) {
+                       if ((scp->initprot & (VM_PROT_READ|VM_PROT_EXECUTE)) == (VM_PROT_READ|VM_PROT_EXECUTE)) {
+                               result->validentry = 1;
+                       } else {
+                               /* right range but wrong protections, unset if previously validated */
+                               result->validentry = 0;
+                       }
+               }
        }
-       if ( (scp->fileoff == 0) && (scp->filesize != 0) )
-               result->mach_header = map_addr;
-       return(LOAD_SUCCESS);
+
+       return ret;
 }
 
 static
 load_return_t
-load_segment_64(
-       struct segment_command_64       *scp64,
-       void *                          pager,
-       off_t                           pager_offset,
-       off_t                           macho_size,
-       __unused off_t                  end_of_file,
-       vm_map_t                        map,
+load_uuid(
+       struct uuid_command     *uulp,
+       char                    *command_end,
        load_result_t           *result
 )
 {
-       kern_return_t           ret;
-       mach_vm_offset_t        map_addr, map_offset;
-       mach_vm_size_t          map_size, seg_size, delta_size;
-       vm_prot_t               initprot;
-       vm_prot_t               maxprot;
-       
-       /*
-        * Make sure what we get from the file is really ours (as specified
-        * by macho_size).
-        */
-       if (scp64->fileoff + scp64->filesize > (uint64_t)macho_size)
-               return (LOAD_BADMACHO);
-
-       seg_size = round_page_64(scp64->vmsize);
-       if (seg_size == 0)
-               return(KERN_SUCCESS);
-
-       /*
-        *      Round sizes to page size.
-        */
-       map_size = round_page_64(scp64->filesize);      /* limited to 32 bits */
-       map_addr = round_page_64(scp64->vmaddr);
-
-       map_offset = pager_offset + scp64->fileoff;     /* limited to 32 bits */
-
-       if (map_size > 0) {
-               initprot = (scp64->initprot) & VM_PROT_ALL;
-               maxprot = (scp64->maxprot) & VM_PROT_ALL;
                /*
-                *      Map a copy of the file into the address space.
-                */
-               ret = mach_vm_map(map,
-                               &map_addr, map_size, (mach_vm_offset_t)0,
-                               VM_FLAGS_FIXED, pager, map_offset, TRUE,
-                               initprot, maxprot,
-                               VM_INHERIT_DEFAULT);
-               if (ret != KERN_SUCCESS)
-                       return(LOAD_NOSPACE);
-       
-               /*
-                *      If the file didn't end on a page boundary,
-                *      we need to zero the leftover.
+                * We need to check the following for this command:
+                * - The command size should be atleast the size of struct uuid_command
+                * - The UUID part of the command should be completely within the mach-o header
                 */
-               delta_size = map_size - scp64->filesize;
-#if FIXME
-               if (delta_size > 0) {
-                       mach_vm_offset_t        tmp;
-       
-                       ret = vm_allocate(kernel_map, &tmp, delta_size, VM_FLAGS_ANYWHERE);
-                       if (ret != KERN_SUCCESS)
-                               return(LOAD_RESOURCE);
-       
-                       if (copyout(tmp, map_addr + scp64->filesize,
-                                                               delta_size)) {
-                               (void) vm_deallocate(
-                                               kernel_map, tmp, delta_size);
-               return (LOAD_FAILURE);
-                       }
-       
-                       (void) vm_deallocate(kernel_map, tmp, delta_size);
-               }
-#endif /* FIXME */
-       }
 
-       /*
-        *      If the virtual size of the segment is greater
-        *      than the size from the file, we need to allocate
-        *      zero fill memory for the rest.
-        */
-       delta_size = seg_size - map_size;
-       if (delta_size > 0) {
-               mach_vm_offset_t tmp = map_addr + map_size;
-
-               ret = mach_vm_allocate(map, &tmp, delta_size, VM_FLAGS_FIXED);
-               if (ret != KERN_SUCCESS)
-                       return(LOAD_NOSPACE);
-       }
-
-       /*
-        *      Set protection values. (Note: ignore errors!)
-        */
-
-       if (scp64->maxprot != VM_PROT_DEFAULT) {
-               (void) mach_vm_protect(map,
-                                       map_addr, seg_size,
-                                       TRUE, scp64->maxprot);
-       }
-       if (scp64->initprot != VM_PROT_DEFAULT) {
-               (void) mach_vm_protect(map,
-                                     map_addr, seg_size,
-                                     FALSE, scp64->initprot);
-       }
-       if ( (scp64->fileoff == 0) && (scp64->filesize != 0) )
-               result->mach_header = map_addr;
-       return(LOAD_SUCCESS);
+               if ((uulp->cmdsize < sizeof(struct uuid_command)) ||
+                   (((char *)uulp + sizeof(struct uuid_command)) > command_end)) {
+                       return (LOAD_BADMACHO);
+               }
+               
+               memcpy(&result->uuid[0], &uulp->uuid[0], sizeof(result->uuid));
+               return (LOAD_SUCCESS);
 }
 
 static
 load_return_t
-load_thread(
-       struct thread_command   *tcp,
-       thread_t                        thread,
+load_main(
+       struct entry_point_command      *epc,
+       thread_t                thread,
+       int64_t                         slide,
        load_result_t           *result
 )
 {
-       kern_return_t   kret;
-       load_return_t   lret;
-       task_t                  task;
-       int customstack=0;
-
-       task = get_threadtask(thread);
-
-       /* if count is 0; same as thr_act */
+       mach_vm_offset_t addr;
+       kern_return_t   ret;
+       
+       if (epc->cmdsize < sizeof(*epc))
+               return (LOAD_BADMACHO);
        if (result->thread_count != 0) {
-               kret = thread_create(task, &thread);
-               if (kret != KERN_SUCCESS)
-                       return(LOAD_RESOURCE);
-               thread_deallocate(thread);
+               return (LOAD_FAILURE);
        }
 
-       lret = load_threadstate(thread,
-                      (unsigned long *)(((vm_offset_t)tcp) + 
-                               sizeof(struct thread_command)),
-                      tcp->cmdsize - sizeof(struct thread_command));
-       if (lret != LOAD_SUCCESS)
-               return (lret);
-
-       if (result->thread_count == 0) {
-               lret = load_threadstack(thread,
-                               (unsigned long *)(((vm_offset_t)tcp) + 
-                                       sizeof(struct thread_command)),
-                               tcp->cmdsize - sizeof(struct thread_command),
-                               &result->user_stack,
-                               &customstack);
-               if (customstack)
-                               result->customstack = 1;
-               else
-                               result->customstack = 0;
-                       
-               if (lret != LOAD_SUCCESS)
-                       return(lret);
+       if (thread == THREAD_NULL)
+               return (LOAD_SUCCESS);
+       
+       /* LC_MAIN specifies stack size but not location */
+       if (epc->stacksize) {
+               result->prog_stack_size = 1;
+               result->user_stack_size = epc->stacksize;
+       } else {
+               result->prog_stack_size = 0;
+               result->user_stack_size = MAXSSIZ;
+       }
+       result->prog_allocated_stack = 0;
+
+       /* use default location for stack */
+       ret = thread_userstackdefault(thread, &addr);
+       if (ret != KERN_SUCCESS)
+               return(LOAD_FAILURE);
+
+       /* The stack slides down from the default location */
+       result->user_stack = addr;
+       result->user_stack -= slide;
 
-               lret = load_threadentry(thread,
-                               (unsigned long *)(((vm_offset_t)tcp) + 
-                                       sizeof(struct thread_command)),
-                               tcp->cmdsize - sizeof(struct thread_command),
-                               &result->entry_point);
-               if (lret != LOAD_SUCCESS)
-                       return(lret);
+       if (result->using_lcmain || result->entry_point != MACH_VM_MIN_ADDRESS) {
+               /* Already processed LC_MAIN or LC_UNIXTHREAD */
+               return (LOAD_FAILURE);
        }
-       /*
-        *      Resume thread now, note that this means that the thread
-        *      commands should appear after all the load commands to
-        *      be sure they don't reference anything not yet mapped.
-        */
-       else
-               thread_resume(thread);
-               
+
+       /* kernel does *not* use entryoff from LC_MAIN.  Dyld uses it. */
+       result->needs_dynlinker = TRUE;
+       result->using_lcmain = TRUE;
+       result->unixproc = TRUE;
        result->thread_count++;
 
        return(LOAD_SUCCESS);
 }
 
+
 static
 load_return_t
 load_unixthread(
        struct thread_command   *tcp,
        thread_t                thread,
+       int64_t                         slide,
        load_result_t           *result
 )
 {
        load_return_t   ret;
        int customstack =0;
+       mach_vm_offset_t addr;
        
-       if (result->thread_count != 0)
+       if (tcp->cmdsize < sizeof(*tcp))
+               return (LOAD_BADMACHO);
+       if (result->thread_count != 0) {
                return (LOAD_FAILURE);
+       }
+
+       if (thread == THREAD_NULL)
+               return (LOAD_SUCCESS);
        
        ret = load_threadstack(thread,
-                      (unsigned long *)(((vm_offset_t)tcp) + 
+                      (uint32_t *)(((vm_offset_t)tcp) + 
                                sizeof(struct thread_command)),
                       tcp->cmdsize - sizeof(struct thread_command),
-                      &result->user_stack,
+                      &addr,
                           &customstack);
        if (ret != LOAD_SUCCESS)
                return(ret);
 
-       if (customstack)
-                       result->customstack = 1;
-       else
-                       result->customstack = 0;
+       /* LC_UNIXTHREAD optionally specifies stack size and location */
+    
+       if (customstack) {
+               result->prog_stack_size = 0;    /* unknown */
+               result->prog_allocated_stack = 1;
+       } else {
+               result->prog_allocated_stack = 0;
+               result->prog_stack_size = 0;
+               result->user_stack_size = MAXSSIZ;
+       }
+
+       /* The stack slides down from the default location */
+       result->user_stack = addr;
+       result->user_stack -= slide;
+
        ret = load_threadentry(thread,
-                      (unsigned long *)(((vm_offset_t)tcp) + 
+                      (uint32_t *)(((vm_offset_t)tcp) + 
                                sizeof(struct thread_command)),
                       tcp->cmdsize - sizeof(struct thread_command),
-                      &result->entry_point);
+                      &addr);
        if (ret != LOAD_SUCCESS)
                return(ret);
 
+       if (result->using_lcmain || result->entry_point != MACH_VM_MIN_ADDRESS) {
+               /* Already processed LC_MAIN or LC_UNIXTHREAD */
+               return (LOAD_FAILURE);
+       }
+
+       result->entry_point = addr;
+       result->entry_point += slide;
+
        ret = load_threadstate(thread,
-                      (unsigned long *)(((vm_offset_t)tcp) + 
-                               sizeof(struct thread_command)),
-                      tcp->cmdsize - sizeof(struct thread_command));
+                      (uint32_t *)(((vm_offset_t)tcp) + sizeof(struct thread_command)),
+                      tcp->cmdsize - sizeof(struct thread_command),
+                      result);
        if (ret != LOAD_SUCCESS)
                return (ret);
 
@@ -989,62 +1610,83 @@ static
 load_return_t
 load_threadstate(
        thread_t        thread,
-       unsigned long   *ts,
-       unsigned long   total_size
+       uint32_t        *ts,
+       uint32_t        total_size,
+       load_result_t   *result
 )
 {
-       kern_return_t   ret;
-       unsigned long   size;
+       uint32_t        size;
        int             flavor;
-       unsigned long   thread_size;
+       uint32_t        thread_size;
+       uint32_t        *local_ts = NULL;
+       uint32_t        local_ts_size = 0;
+       int             ret;
+
+       (void)thread;
+
+       if (total_size > 0) {
+               local_ts_size = total_size;
+               local_ts = kalloc(local_ts_size);
+               if (local_ts == NULL) {
+                       return LOAD_FAILURE;
+               }
+               memcpy(local_ts, ts, local_ts_size);
+               ts = local_ts;
+       }
 
-    ret = thread_state_initialize( thread );
-    if (ret != KERN_SUCCESS)
-        return(LOAD_FAILURE);
-    
        /*
-        *      Set the new thread state; iterate through the state flavors in
-     *  the mach-o file.
+        * Validate the new thread state; iterate through the state flavors in
+        * the Mach-O file.
+        * XXX: we should validate the machine state here, to avoid failing at
+        * activation time where we can't bail out cleanly.
         */
        while (total_size > 0) {
                flavor = *ts++;
                size = *ts++;
-               thread_size = (size+2)*sizeof(unsigned long);
-               if (thread_size > total_size)
-                       return(LOAD_BADMACHO);
-               total_size -= thread_size;
-               /*
-                * Third argument is a kernel space pointer; it gets cast
-                * to the appropriate type in machine_thread_set_state()
-                * based on the value of flavor.
-                */
-               ret = thread_setstatus(thread, flavor, (thread_state_t)ts, size);
-               if (ret != KERN_SUCCESS)
-                       return(LOAD_FAILURE);
-               ts += size;     /* ts is a (unsigned long *) */
+
+               if (os_add_overflow(size, UINT32_C(2), &thread_size) ||
+                   os_mul_overflow(thread_size, (uint32_t)sizeof(uint32_t), &thread_size) ||
+                   os_sub_overflow(total_size, thread_size, &total_size)) {
+                       ret = LOAD_BADMACHO;
+                       goto bad;
+               }
+
+               ts += size;     /* ts is a (uint32_t *) */
        }
-       return(LOAD_SUCCESS);
+
+       result->threadstate = local_ts;
+       result->threadstate_sz = local_ts_size;
+       return LOAD_SUCCESS;
+
+bad:
+       if (local_ts) {
+               kfree(local_ts, local_ts_size);
+       }
+       return ret;
 }
 
 static
 load_return_t
 load_threadstack(
        thread_t        thread,
-       unsigned long   *ts,
-       unsigned long   total_size,
-       user_addr_t     *user_stack,
+       uint32_t        *ts,
+       uint32_t        total_size,
+       mach_vm_offset_t        *user_stack,
        int *customstack
 )
 {
        kern_return_t   ret;
-       unsigned long   size;
+       uint32_t        size;
        int             flavor;
-       unsigned long   stack_size;
+       uint32_t        stack_size;
 
        while (total_size > 0) {
                flavor = *ts++;
                size = *ts++;
-               stack_size = (size+2)*sizeof(unsigned long);
+               if (UINT32_MAX-2 < size ||
+                   UINT32_MAX/sizeof(uint32_t) < size+2)
+                       return (LOAD_BADMACHO);
+               stack_size = (size+2)*sizeof(uint32_t);
                if (stack_size > total_size)
                        return(LOAD_BADMACHO);
                total_size -= stack_size;
@@ -1055,9 +1697,10 @@ load_threadstack(
                 * the value of flavor.
                 */
                ret = thread_userstack(thread, flavor, (thread_state_t)ts, size, user_stack, customstack);
-               if (ret != KERN_SUCCESS)
+               if (ret != KERN_SUCCESS) {
                        return(LOAD_FAILURE);
-               ts += size;     /* ts is a (unsigned long *) */
+               }
+               ts += size;     /* ts is a (uint32_t *) */
        }
        return(LOAD_SUCCESS);
 }
@@ -1066,15 +1709,15 @@ static
 load_return_t
 load_threadentry(
        thread_t        thread,
-       unsigned long   *ts,
-       unsigned long   total_size,
+       uint32_t        *ts,
+       uint32_t        total_size,
        mach_vm_offset_t        *entry_point
 )
 {
        kern_return_t   ret;
-       unsigned long   size;
+       uint32_t        size;
        int             flavor;
-       unsigned long   entry_size;
+       uint32_t        entry_size;
 
        /*
         *      Set the thread state.
@@ -1083,7 +1726,10 @@ load_threadentry(
        while (total_size > 0) {
                flavor = *ts++;
                size = *ts++;
-               entry_size = (size+2)*sizeof(unsigned long);
+               if (UINT32_MAX-2 < size ||
+                   UINT32_MAX/sizeof(uint32_t) < size+2)
+                       return (LOAD_BADMACHO);
+               entry_size = (size+2)*sizeof(uint32_t);
                if (entry_size > total_size)
                        return(LOAD_BADMACHO);
                total_size -= entry_size;
@@ -1093,38 +1739,53 @@ load_threadentry(
                 * the value of flavor.
                 */
                ret = thread_entrypoint(thread, flavor, (thread_state_t)ts, size, entry_point);
-               if (ret != KERN_SUCCESS)
+               if (ret != KERN_SUCCESS) {
                        return(LOAD_FAILURE);
-               ts += size;     /* ts is a (unsigned long *) */
+               }
+               ts += size;     /* ts is a (uint32_t *) */
        }
        return(LOAD_SUCCESS);
 }
 
+struct macho_data {
+       struct nameidata        __nid;
+       union macho_vnode_header {
+               struct mach_header      mach_header;
+               struct fat_header       fat_header;
+               char    __pad[512];
+       } __header;
+};
 
-static
-load_return_t
+#define DEFAULT_DYLD_PATH "/usr/lib/dyld"
+
+static load_return_t
 load_dylinker(
        struct dylinker_command *lcp,
        integer_t               archbits,
        vm_map_t                map,
-       thread_t        thr_act,
+       thread_t        thread,
        int                     depth,
-       load_result_t           *result,
-       boolean_t               clean_regions
+       int64_t                 slide,
+       load_result_t           *result
 )
 {
        char                    *name;
        char                    *p;
-       struct vnode            *vp;
-       struct mach_header      header;
-       off_t                   file_offset;
-       off_t                   macho_size;
-       vm_map_t                copy_map;
-       load_result_t           myresult;
+       struct vnode            *vp = NULLVP;   /* set by get_macho_vnode() */
+       struct mach_header      *header;
+       off_t                   file_offset = 0; /* set by get_macho_vnode() */
+       off_t                   macho_size = 0; /* set by get_macho_vnode() */
+       load_result_t           *myresult;
        kern_return_t           ret;
-       vm_map_copy_t   tmp;
-       mach_vm_offset_t        dyl_start, map_addr;
-       mach_vm_size_t          dyl_length;
+       struct macho_data       *macho_data;
+       struct {
+               struct mach_header      __header;
+               load_result_t           __myresult;
+               struct macho_data       __macho_data;
+       } *dyld_data;
+
+       if (lcp->cmdsize < sizeof(*lcp))
+               return (LOAD_BADMACHO);
 
        name = (char *)lcp + lcp->name.offset;
        /*
@@ -1136,88 +1797,375 @@ load_dylinker(
                        return(LOAD_BADMACHO);
        } while (*p++);
 
-       ret = get_macho_vnode(name, archbits, &header, &file_offset, &macho_size, &vp);
+#if !(DEVELOPMENT || DEBUG)
+       if (0 != strcmp(name, DEFAULT_DYLD_PATH)) {
+               return (LOAD_BADMACHO);
+       }
+#endif
+
+       /* Allocate wad-of-data from heap to reduce excessively deep stacks */
+
+       MALLOC(dyld_data, void *, sizeof (*dyld_data), M_TEMP, M_WAITOK);
+       header = &dyld_data->__header;
+       myresult = &dyld_data->__myresult;
+       macho_data = &dyld_data->__macho_data;
+
+       ret = get_macho_vnode(name, archbits, header,
+           &file_offset, &macho_size, macho_data, &vp);
        if (ret)
-               return (ret);
-                       
+               goto novp_out;
+
+       *myresult = load_result_null;
+
        /*
-        *      Load the Mach-O.
-        *      Use a temporary map to do the work.
+        *      First try to map dyld in directly.  This should work most of
+        *      the time since there shouldn't normally be something already
+        *      mapped to its address.
         */
-       copy_map = vm_map_create(pmap_create(vm_map_round_page(macho_size)),
-                                get_map_min(map), get_map_max(map), TRUE);
-       if (VM_MAP_NULL == copy_map) {
-               ret = LOAD_RESOURCE;
-               goto out;
-       }
 
-       myresult = load_result_null;
+       ret = parse_machfile(vp, map, thread, header, file_offset,
+                            macho_size, depth, slide, 0, myresult);
 
-       ret = parse_machfile(vp, copy_map, thr_act, &header,
-                               file_offset, macho_size,
-                               FALSE, clean_regions, depth, &myresult);
+       /*
+        *      If it turned out something was in the way, then we'll take
+        *      take this longer path to preflight dyld's vm ranges, then
+        *      map it at a free location in the address space.
+        */
 
-       if (ret)
-               goto out;
+       if (ret == LOAD_NOSPACE) {
+               mach_vm_offset_t        dyl_start, map_addr;
+               mach_vm_size_t  dyl_length;
+               int64_t                 slide_amount;
 
-       if (get_map_nentries(copy_map) > 0) {
+               *myresult = load_result_null;
 
-               dyl_start = mach_get_vm_start(copy_map);
-               dyl_length = mach_get_vm_end(copy_map) - dyl_start;
+               /*
+                * Preflight parsing the Mach-O file with a NULL
+                * map, which will return the ranges needed for a
+                * subsequent map attempt (with a slide) in "myresult"
+                */
+               ret = parse_machfile(vp, VM_MAP_NULL, THREAD_NULL, header,
+                                    file_offset, macho_size, depth,
+                                    0 /* slide */, 0, myresult);
 
-               map_addr = dyl_start;
-               ret = mach_vm_allocate(map, &map_addr, dyl_length, VM_FLAGS_FIXED);
-               if (ret != KERN_SUCCESS)  {
-                       ret = mach_vm_allocate(map, &map_addr, dyl_length, VM_FLAGS_ANYWHERE);
+               if (ret != LOAD_SUCCESS) {
+                       goto out;
                }
 
+               dyl_start = myresult->min_vm_addr;
+               dyl_length = myresult->max_vm_addr - myresult->min_vm_addr;
+
+               dyl_length += slide;
+
+               /* To find an appropriate load address, do a quick allocation */
+               map_addr = dyl_start;
+               ret = mach_vm_allocate(map, &map_addr, dyl_length, VM_FLAGS_ANYWHERE);
                if (ret != KERN_SUCCESS) {
                        ret = LOAD_NOSPACE;
                        goto out;
-               
                }
-               ret = vm_map_copyin(copy_map,
-                                   (vm_map_address_t)dyl_start,
-                                   (vm_map_size_t)dyl_length,
-                                   TRUE, &tmp);
+
+               ret = mach_vm_deallocate(map, map_addr, dyl_length);
                if (ret != KERN_SUCCESS) {
-                       (void) vm_map_remove(map,
-                                    vm_map_trunc_page(map_addr),
-                                    vm_map_round_page(map_addr + dyl_length),
-                                    VM_MAP_NO_FLAGS);
+                       ret = LOAD_NOSPACE;
                        goto out;
                }
+               
+               if (map_addr < dyl_start)
+                       slide_amount = -(int64_t)(dyl_start - map_addr);
+               else
+                       slide_amount = (int64_t)(map_addr - dyl_start);
 
-               ret = vm_map_copy_overwrite(map,
-                                    (vm_map_address_t)map_addr,
-                                    tmp, FALSE);
-               if (ret != KERN_SUCCESS) {
-                       vm_map_copy_discard(tmp);
-                       (void) vm_map_remove(map,
-                                    vm_map_trunc_page(map_addr),
-                                    vm_map_round_page(map_addr + dyl_length),
-                                    VM_MAP_NO_FLAGS);
+               slide_amount += slide;
+
+               *myresult = load_result_null;
+
+               ret = parse_machfile(vp, map, thread, header,
+                                    file_offset, macho_size, depth,
+                                    slide_amount, 0, myresult);
+
+               if (ret) {
                        goto out;
                }
+       }
+
+       if (ret == LOAD_SUCCESS) {
+               if (result->threadstate) {
+                       /* don't use the app's threadstate if we have a dyld */
+                       kfree(result->threadstate, result->threadstate_sz);
+               }
+               result->threadstate = myresult->threadstate;
+               result->threadstate_sz = myresult->threadstate_sz;
 
-               if (map_addr != dyl_start)
-                       myresult.entry_point += (map_addr - dyl_start);
-       } else
-               ret = LOAD_FAILURE;
-       
-       if (ret == LOAD_SUCCESS) {              
                result->dynlinker = TRUE;
-               result->entry_point = myresult.entry_point;
-               (void)ubc_map(vp, PROT_EXEC);
+               result->entry_point = myresult->entry_point;
+               result->validentry = myresult->validentry;
+               result->all_image_info_addr = myresult->all_image_info_addr;
+               result->all_image_info_size = myresult->all_image_info_size;
+               if (myresult->platform_binary) {
+                       result->csflags |= CS_DYLD_PLATFORM;
+               }
        }
 out:
-       vm_map_deallocate(copy_map);
-       
        vnode_put(vp);
+novp_out:
+       FREE(dyld_data, M_TEMP);
        return (ret);
 
 }
 
+static load_return_t
+load_code_signature(
+       struct linkedit_data_command    *lcp,
+       struct vnode                    *vp,
+       off_t                           macho_offset,
+       off_t                           macho_size,
+       cpu_type_t                      cputype,
+       load_result_t                   *result)
+{
+       int             ret;
+       kern_return_t   kr;
+       vm_offset_t     addr;
+       int             resid;
+       struct cs_blob  *blob;
+       int             error;
+       vm_size_t       blob_size;
+
+       addr = 0;
+       blob = NULL;
+
+       if (lcp->cmdsize != sizeof (struct linkedit_data_command) ||
+           lcp->dataoff + lcp->datasize > macho_size) {
+               ret = LOAD_BADMACHO;
+               goto out;
+       }
+
+       blob = ubc_cs_blob_get(vp, cputype, macho_offset);
+       if (blob != NULL) {
+               /* we already have a blob for this vnode and cputype */
+               if (blob->csb_cpu_type == cputype &&
+                   blob->csb_base_offset == macho_offset &&
+                   blob->csb_mem_size == lcp->datasize) {
+                       /* it matches the blob we want here, lets verify the version */
+                       if(0 != ubc_cs_generation_check(vp)) {
+                               if (0 != ubc_cs_blob_revalidate(vp, blob, 0)) {
+                                       ret = LOAD_FAILURE; /* set error same as from ubc_cs_blob_add */
+                                       goto out;
+                               }
+                       }
+                       ret = LOAD_SUCCESS;
+               } else {
+                       /* the blob has changed for this vnode: fail ! */
+                       ret = LOAD_BADMACHO;
+               }
+               goto out;
+       }
+
+       blob_size = lcp->datasize;
+       kr = ubc_cs_blob_allocate(&addr, &blob_size);
+       if (kr != KERN_SUCCESS) {
+               ret = LOAD_NOSPACE;
+               goto out;
+       }
+       
+       resid = 0;
+       error = vn_rdwr(UIO_READ,
+                       vp,
+                       (caddr_t) addr,
+                       lcp->datasize,
+                       macho_offset + lcp->dataoff,
+                       UIO_SYSSPACE,
+                       0,
+                       kauth_cred_get(),
+                       &resid,
+                       current_proc());
+       if (error || resid != 0) {
+               ret = LOAD_IOERROR;
+               goto out;
+       }
+
+       if (ubc_cs_blob_add(vp,
+                           cputype,
+                           macho_offset,
+                           addr,
+                           lcp->datasize,
+                           0,
+                           &blob)) {
+               ret = LOAD_FAILURE;
+               goto out;
+       } else {
+               /* ubc_cs_blob_add() has consumed "addr" */
+               addr = 0;
+       }
+
+#if CHECK_CS_VALIDATION_BITMAP
+       ubc_cs_validation_bitmap_allocate( vp );
+#endif
+               
+       ret = LOAD_SUCCESS;
+out:
+       if (ret == LOAD_SUCCESS) {
+               if (blob == NULL)
+                       panic("sucess, but no blob!");
+
+               result->csflags |= blob->csb_flags;
+               result->platform_binary = blob->csb_platform_binary;
+               result->cs_end_offset = blob->csb_end_offset;
+       }
+       if (addr != 0) {
+               ubc_cs_blob_deallocate(addr, blob_size);
+               addr = 0;
+       }
+
+       return ret;
+}
+
+
+#if CONFIG_CODE_DECRYPTION
+
+static load_return_t
+set_code_unprotect(
+       struct encryption_info_command *eip,
+       caddr_t addr,   
+       vm_map_t map,
+       int64_t slide,
+       struct vnode *vp,
+       off_t macho_offset,
+       cpu_type_t cputype,
+       cpu_subtype_t cpusubtype)
+{
+       int error, len;
+       pager_crypt_info_t crypt_info;
+       const char * cryptname = 0;
+       char *vpath;
+       
+       size_t offset;
+       struct segment_command_64 *seg64;
+       struct segment_command *seg32;
+       vm_map_offset_t map_offset, map_size;
+       vm_object_offset_t crypto_backing_offset;
+       kern_return_t kr;
+
+       if (eip->cmdsize < sizeof(*eip)) return LOAD_BADMACHO;
+       
+       switch(eip->cryptid) {
+               case 0:
+                       /* not encrypted, just an empty load command */
+                       return LOAD_SUCCESS;
+               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 LOAD_BADMACHO;
+       }
+       
+       if (map == VM_MAP_NULL) return (LOAD_SUCCESS);
+       if (NULL == text_crypter_create) return LOAD_FAILURE;
+
+       MALLOC_ZONE(vpath, char *, MAXPATHLEN, M_NAMEI, M_WAITOK);
+       if(vpath == NULL) return LOAD_FAILURE;
+       
+       len = MAXPATHLEN;
+       error = vn_getpath(vp, vpath, &len);
+       if (error) {
+               FREE_ZONE(vpath, MAXPATHLEN, M_NAMEI);
+               return LOAD_FAILURE;
+       }
+       
+       /* set up decrypter first */
+       crypt_file_data_t crypt_data = {
+               .filename = vpath,
+               .cputype = cputype,
+               .cpusubtype = cpusubtype};
+       kr=text_crypter_create(&crypt_info, cryptname, (void*)&crypt_data);
+#if DEVELOPMENT || DEBUG
+       struct proc *p;
+       p  = current_proc();
+       printf("APPLE_PROTECT: %d[%s] map %p %s(%s) -> 0x%x\n",
+              p->p_pid, p->p_comm, map, __FUNCTION__, vpath, kr);
+#endif /* DEVELOPMENT || DEBUG */
+       FREE_ZONE(vpath, MAXPATHLEN, M_NAMEI);
+       
+       if(kr) {
+               printf("set_code_unprotect: unable to create decrypter %s, kr=%d\n",
+                      cryptname, kr);
+               if (kr == kIOReturnNotPrivileged) {
+                       /* text encryption returned decryption failure */
+                       return(LOAD_DECRYPTFAIL);
+                }else
+                       return LOAD_RESOURCE;
+       }
+       
+       /* this is terrible, but we have to rescan the load commands to find the
+        * virtual address of this encrypted stuff. This code is gonna look like
+        * the dyld source one day... */
+       struct mach_header *header = (struct mach_header *)addr;
+       size_t mach_header_sz = sizeof(struct mach_header);
+       if (header->magic == MH_MAGIC_64 ||
+           header->magic == MH_CIGAM_64) {
+               mach_header_sz = sizeof(struct mach_header_64);
+       }
+       offset = mach_header_sz;
+       uint32_t ncmds = header->ncmds;
+       while (ncmds--) {
+               /*
+                *      Get a pointer to the command.
+                */
+               struct load_command *lcp = (struct load_command *)(addr + offset);
+               offset += lcp->cmdsize;
+               
+               switch(lcp->cmd) {
+                       case LC_SEGMENT_64:
+                               seg64 = (struct segment_command_64 *)lcp;
+                               if ((seg64->fileoff <= eip->cryptoff) &&
+                                   (seg64->fileoff+seg64->filesize >= 
+                                    eip->cryptoff+eip->cryptsize)) {
+                                       map_offset = seg64->vmaddr + eip->cryptoff - seg64->fileoff + slide;
+                                       map_size = eip->cryptsize;
+                                       crypto_backing_offset = macho_offset + eip->cryptoff;
+                                       goto remap_now;
+                               }
+                       case LC_SEGMENT:
+                               seg32 = (struct segment_command *)lcp;
+                               if ((seg32->fileoff <= eip->cryptoff) &&
+                                   (seg32->fileoff+seg32->filesize >= 
+                                    eip->cryptoff+eip->cryptsize)) {
+                                       map_offset = seg32->vmaddr + eip->cryptoff - seg32->fileoff + slide;
+                                       map_size = eip->cryptsize;
+                                       crypto_backing_offset = macho_offset + eip->cryptoff;
+                                       goto remap_now;
+                               }
+               }
+       }
+       
+       /* if we get here, did not find anything */
+       return LOAD_BADMACHO;
+       
+remap_now:
+       /* now remap using the decrypter */
+       MACHO_PRINTF(("+++ set_code_unprotect: vm[0x%llx:0x%llx]\n",
+                     (uint64_t) map_offset,
+                     (uint64_t) (map_offset+map_size)));
+       kr = vm_map_apple_protected(map,
+                                   map_offset,
+                                   map_offset+map_size,
+                                   crypto_backing_offset,
+                                   &crypt_info);
+       if (kr) {
+               printf("set_code_unprotect(): mapping failed with %x\n", kr);
+               return LOAD_PROTECT;
+       }
+       
+       return LOAD_SUCCESS;
+}
+
+#endif
+
 /*
  * This routine exists to support the load_dylinker().
  *
@@ -1232,44 +2180,46 @@ get_macho_vnode(
        struct mach_header      *mach_header,
        off_t                   *file_offset,
        off_t                   *macho_size,
+       struct macho_data       *data,
        struct vnode            **vpp
 )
 {
        struct vnode            *vp;
-       struct vfs_context context;
-       struct nameidata nid, *ndp;
-       struct proc *p = current_proc();                /* XXXX */
+       vfs_context_t           ctx = vfs_context_current();
+       proc_t                  p = vfs_context_proc(ctx);
+       kauth_cred_t            kerncred;
+       struct nameidata        *ndp = &data->__nid;
        boolean_t               is_fat;
        struct fat_arch         fat_arch;
-       int                     error = LOAD_SUCCESS;
+       int                     error;
        int resid;
-       union {
-               struct mach_header      mach_header;
-               struct fat_header       fat_header;
-               char    pad[512];
-       } header;
+       union macho_vnode_header *header = &data->__header;
        off_t fsize = (off_t)0;
-       struct  ucred *cred = kauth_cred_get();
-       int err2;
-       
-       context.vc_proc = p;
-       context.vc_ucred = cred;
 
-       ndp = &nid;
-       
+       /*
+        * Capture the kernel credential for use in the actual read of the
+        * file, since the user doing the execution may have execute rights
+        * but not read rights, but to exec something, we have to either map
+        * or read it into the new process address space, which requires
+        * read rights.  This is to deal with lack of common credential
+        * serialization code which would treat NOCRED as "serialize 'root'".
+        */
+       kerncred = vfs_context_ucred(vfs_context_kernel());
+
        /* init the namei data to point the file user's program name */
-       NDINIT(ndp, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE32, CAST_USER_ADDR_T(path), &context);
+       NDINIT(ndp, LOOKUP, OP_OPEN, FOLLOW | LOCKLEAF, UIO_SYSSPACE, CAST_USER_ADDR_T(path), ctx);
 
        if ((error = namei(ndp)) != 0) {
-               if (error == ENOENT)
+               if (error == ENOENT) {
                        error = LOAD_ENOENT;
-               else
+               } else {
                        error = LOAD_FAILURE;
+               }
                return(error);
        }
        nameidone(ndp);
        vp = ndp->ni_vp;
-       
+
        /* check for regular file */
        if (vp->v_type != VREG) {
                error = LOAD_PROTECT;
@@ -1277,7 +2227,7 @@ get_macho_vnode(
        }
 
        /* get size */
-       if ((error = vnode_size(vp, &fsize, &context)) != 0) {
+       if ((error = vnode_size(vp, &fsize, ctx)) != 0) {
                error = LOAD_FAILURE;
                goto bad1;
        }
@@ -1289,58 +2239,75 @@ get_macho_vnode(
        }
 
        /* check access */
-       if ((error = vnode_authorize(vp, NULL, KAUTH_VNODE_EXECUTE, &context)) != 0) {
+       if ((error = vnode_authorize(vp, NULL, KAUTH_VNODE_EXECUTE | KAUTH_VNODE_READ_DATA, ctx)) != 0) {
                error = LOAD_PROTECT;
                goto bad1;
        }
 
        /* try to open it */
-       if ((error = VNOP_OPEN(vp, FREAD, &context)) != 0) {
+       if ((error = VNOP_OPEN(vp, FREAD, ctx)) != 0) {
                error = LOAD_PROTECT;
                goto bad1;
        }
 
-       if ((error = vn_rdwr(UIO_READ, vp, (caddr_t)&header, sizeof(header), 0,
-           UIO_SYSSPACE32, IO_NODELOCKED, cred, &resid, p)) != 0) {
+       if ((error = vn_rdwr(UIO_READ, vp, (caddr_t)header, sizeof (*header), 0,
+           UIO_SYSSPACE, IO_NODELOCKED, kerncred, &resid, p)) != 0) {
                error = LOAD_IOERROR;
                goto bad2;
        }
-       
-       if (header.mach_header.magic == MH_MAGIC ||
-           header.mach_header.magic == MH_MAGIC_64)
-           is_fat = FALSE;
-       else if (header.fat_header.magic == FAT_MAGIC ||
-                header.fat_header.magic == FAT_CIGAM)
+
+       if (resid) {
+               error = LOAD_BADMACHO;
+               goto bad2;
+       }
+
+       if (header->mach_header.magic == MH_MAGIC ||
+           header->mach_header.magic == MH_MAGIC_64) {
+               is_fat = FALSE;
+       } else if (OSSwapBigToHostInt32(header->fat_header.magic) == FAT_MAGIC) {
            is_fat = TRUE;
-       else {
-           error = LOAD_BADMACHO;
-           goto bad2;
+       else {
+               error = LOAD_BADMACHO;
+               goto bad2;
        }
 
        if (is_fat) {
+
+               error = fatfile_validate_fatarches((vm_offset_t)(&header->fat_header),
+                                               sizeof(*header));
+               if (error != LOAD_SUCCESS) {
+                       goto bad2;
+               }
+
                /* Look up our architecture in the fat file. */
-               error = fatfile_getarch_with_bits(vp, archbits, (vm_offset_t)(&header.fat_header), &fat_arch);
+               error = fatfile_getarch_with_bits(archbits,
+                                               (vm_offset_t)(&header->fat_header), sizeof(*header), &fat_arch);
                if (error != LOAD_SUCCESS)
                        goto bad2;
 
                /* Read the Mach-O header out of it */
-               error = vn_rdwr(UIO_READ, vp, (caddr_t)&header.mach_header,
-                               sizeof(header.mach_header), fat_arch.offset,
-                               UIO_SYSSPACE32, IO_NODELOCKED, cred, &resid, p);
+               error = vn_rdwr(UIO_READ, vp, (caddr_t)&header->mach_header,
+                   sizeof (header->mach_header), fat_arch.offset,
+                   UIO_SYSSPACE, IO_NODELOCKED, kerncred, &resid, p);
                if (error) {
                        error = LOAD_IOERROR;
                        goto bad2;
                }
 
+               if (resid) {
+                       error = LOAD_BADMACHO;
+                       goto bad2;
+               }
+
                /* Is this really a Mach-O? */
-               if (header.mach_header.magic != MH_MAGIC &&
-                   header.mach_header.magic != MH_MAGIC_64) {
+               if (header->mach_header.magic != MH_MAGIC &&
+                   header->mach_header.magic != MH_MAGIC_64) {
                        error = LOAD_BADMACHO;
                        goto bad2;
                }
 
                *file_offset = fat_arch.offset;
-               *macho_size = fsize = fat_arch.size;
+               *macho_size = fat_arch.size;
        } else {
                /*
                 * Force get_macho_vnode() to fail if the architecture bits
@@ -1352,25 +2319,23 @@ get_macho_vnode(
                 * required, since the dynamic linker might work, but we will
                 * refuse to load it because of this check.
                 */
-               if ((cpu_type_t)(header.mach_header.cputype & CPU_ARCH_MASK) != archbits)
-                       return(LOAD_BADARCH);
+               if ((cpu_type_t)(header->mach_header.cputype & CPU_ARCH_MASK) != archbits) {
+                       error = LOAD_BADARCH;
+                       goto bad2;
+               }
 
                *file_offset = 0;
                *macho_size = fsize;
        }
 
-       *mach_header = header.mach_header;
+       *mach_header = header->mach_header;
        *vpp = vp;
 
        ubc_setsize(vp, fsize);
-       
        return (error);
 
 bad2:
-       err2 = VNOP_CLOSE(vp, FREAD, &context);
-       vnode_put(vp);
-       return (error);
-
+       (void) VNOP_CLOSE(vp, FREAD, ctx);
 bad1:
        vnode_put(vp);
        return(error);