#include <vm/vm_protos.h>
#include <IOKit/IOReturn.h> /* for kIOReturnNotPrivileged */
+#include <os/overflow.h>
+
/*
* XXX vm/pmap.h should not treat these prototypes as MACH_KERNEL_PRIVATE
* when KERNEL is defined.
.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
+ .cs_end_offset = 0,
+ .threadstate = NULL,
+ .threadstate_sz = 0
};
/*
caddr_t addr,
vm_map_t map,
int64_t slide,
- struct vnode *vp,
+ struct vnode *vp,
+ off_t macho_offset,
cpu_type_t cputype,
- cpu_subtype_t cpusubtype);
+ cpu_subtype_t cpusubtype);
#endif
static
load_threadstate(
thread_t thread,
uint32_t *ts,
- uint32_t total_size
+ uint32_t total_size,
+ load_result_t *
);
static load_return_t
}
}
+
load_return_t
load_machfile(
struct image_params *imgp,
struct mach_header *header,
thread_t thread,
- vm_map_t new_map,
+ vm_map_t *mapp,
load_result_t *result
)
{
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;
- task_t old_task = TASK_NULL; /* protected by create_map */
load_result_t myresult;
load_return_t lret;
boolean_t create_map = FALSE;
if (new_map == VM_MAP_NULL) {
create_map = TRUE;
- old_task = current_task();
}
/*
*/
if (spawn) {
create_map = TRUE;
- old_task = get_threadtask(thread);
}
if (create_map) {
}
pmap = pmap_create(get_task_ledger(ledger_task),
(vm_map_size_t) 0,
- (imgp->ip_flags & IMGPF_IS_64BIT));
+ ((imgp->ip_flags & IMGPF_IS_64BIT) != 0));
pal_switch_pmap(thread, pmap, imgp->ip_flags & IMGPF_IS_64BIT);
map = vm_map_create(pmap,
0,
- vm_compute_max_offset((imgp->ip_flags & IMGPF_IS_64BIT)),
+ 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
/*
* 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 */
+ 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);
}
- printf("Cannot enforce a hard page-zero for %s\n", imgp->ip_strings);
- return (LOAD_BADMACHO);
}
- /*
- * Commit to new map.
- *
- * 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.
- */
-
- if (create_map) {
+ 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) {
+ if (!spawn) {
/*
* Mark the task as halting and start the other
* threads towards terminating themselves. Then
workqueue_mark_exiting(p);
task_complete_halt(task);
workqueue_exit(p);
+ kqueue_dealloc(p->p_wqkqueue);
+ p->p_wqkqueue = NULL;
}
- old_map = swap_task_map(old_task, thread, map, !spawn);
- vm_map_deallocate(old_map);
+ *mapp = map;
}
return(LOAD_SUCCESS);
}
+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
* this is the limit on the kalloc() of enough bytes for a mach_header and
int pass;
proc_t p = current_proc(); /* XXXX */
int error;
- int resid=0;
+ int resid = 0;
size_t mach_header_sz = sizeof(struct mach_header);
boolean_t abi64;
boolean_t got_code_signatures = FALSE;
/*
* 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 <= 3; 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
*/
switch(lcp->cmd) {
case LC_SEGMENT:
+ if (pass == 0) {
+ break;
+ }
+
if (pass != 2)
break;
break;
ret = set_code_unprotect(
(struct encryption_info_command *) lcp,
- addr, map, slide, vp,
+ addr, map, slide, vp, file_offset,
header->cputype, header->cpusubtype);
if (ret != LOAD_SUCCESS) {
printf("proc %d: set_code_unprotect() error %d "
proc_lock(p);
p->p_lflag |= P_LTERM_DECRYPTFAIL;
proc_unlock(p);
- }
+ }
psignal(p, SIGKILL);
}
break;
if (cs_enforcement(NULL)) {
ret = LOAD_FAILURE;
} else {
- /*
- * 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.
- */
+ /*
+ * 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;
+ 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;
+ /* get flags to be applied to the process */
+ result->csflags |= cs_flag_data;
}
}
}
/* Make sure if we need dyld, we got it */
- if ((ret == LOAD_SUCCESS) && result->needs_dynlinker && !dlp) {
+ if (result->needs_dynlinker && !dlp) {
ret = LOAD_FAILURE;
}
-
+
if ((ret == LOAD_SUCCESS) && (dlp != 0)) {
/*
* load the dylinker, and slide it by the independent DYLD ASLR
#if CONFIG_CODE_DECRYPTION
-#define APPLE_UNPROTECTED_HEADER_SIZE (3 * PAGE_SIZE_64)
+#define APPLE_UNPROTECTED_HEADER_SIZE (3 * 4096)
static load_return_t
unprotect_dsmos_segment(
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);
}
}
#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 load_command *lcp,
- uint32_t filetype,
- void * control,
- off_t pager_offset,
- off_t macho_size,
- struct vnode *vp,
- vm_map_t map,
- int64_t slide,
- load_result_t *result
-)
+ struct load_command *lcp,
+ uint32_t filetype,
+ void * control,
+ off_t pager_offset,
+ off_t macho_size,
+ struct vnode *vp,
+ vm_map_t map,
+ int64_t slide,
+ load_result_t *result)
{
struct segment_command_64 segment_command, *scp;
kern_return_t ret;
- vm_map_offset_t map_addr, map_offset;
- vm_map_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);
return (LOAD_BADMACHO);
total_section_size = lcp->cmdsize - segment_command_size;
- if (LC_SEGMENT_64 == lcp->cmd)
+ if (LC_SEGMENT_64 == lcp->cmd) {
scp = (struct segment_command_64 *)lcp;
- else {
+ } 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 < scp->fileoff ||
- scp->fileoff + scp->filesize > (uint64_t)macho_size)
+ scp->fileoff + scp->filesize > (uint64_t)macho_size) {
return (LOAD_BADMACHO);
+ }
/*
* Ensure that the number of sections specified would fit
* within the load command size.
*/
- if (total_section_size / single_section_size < scp->nsects)
+ if (total_section_size / single_section_size < scp->nsects) {
return (LOAD_BADMACHO);
+ }
/*
* Make sure the segment is page-aligned in the file.
*/
- if ((scp->fileoff & PAGE_MASK_64) != 0)
+ 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);
+ }
/*
* If we have a code signature attached for this slice
return LOAD_BADMACHO;
}
- /*
- * Round sizes to page size.
- */
- seg_size = round_page_64(scp->vmsize);
- map_size = round_page_64(scp->filesize);
- map_addr = trunc_page_64(scp->vmaddr); /* JVXXX note that in XNU TOT this is round instead of trunc for 64 bits */
-
- seg_size = vm_map_round_page(seg_size, vm_map_page_mask(map));
- map_size = vm_map_round_page(map_size, vm_map_page_mask(map));
-
- if (seg_size == 0)
- return (KERN_SUCCESS);
- if (map_addr == 0 &&
- map_size == 0 &&
- seg_size != 0 &&
+ 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) {
/*
* between the end of page zero and the beginning of the first
* slid segment.
*/
- seg_size += slide;
- slide = 0;
-
/*
* This is a "page zero" segment: it starts at address 0,
* is not mapped from the binary file and is not accessible.
* make it completely off limits by raising the VM map's
* minimum offset.
*/
- ret = vm_map_raise_min_offset(map, seg_size);
+ 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 {
}
- /* If a non-zero slide was specified by the caller, apply now */
- map_addr += slide;
+ {
+ 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 (map_addr < result->min_vm_addr)
- result->min_vm_addr = map_addr;
- if (map_addr+seg_size > result->max_vm_addr)
- result->max_vm_addr = map_addr+seg_size;
+ 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;
if (map == VM_MAP_NULL)
return (LOAD_SUCCESS);
- map_offset = pager_offset + scp->fileoff; /* limited to 32 bits */
-
- 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_enter_mem_object_control(map,
- &map_addr, map_size, (mach_vm_offset_t)0,
- VM_FLAGS_FIXED, control, 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) {
mach_vm_offset_t tmp;
- ret = mach_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)) {
* 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) {
- mach_vm_offset_t tmp = map_addr + map_size;
-
- ret = mach_vm_map(map, &tmp, delta_size, 0, VM_FLAGS_FIXED,
- NULL, 0, FALSE,
- scp->initprot, scp->maxprot,
- VM_INHERIT_DEFAULT);
- 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);
+ }
}
if ( (scp->fileoff == 0) && (scp->filesize != 0) )
- result->mach_header = map_addr;
+ result->mach_header = vm_offset;
if (scp->flags & SG_PROTECTED_VERSION_1) {
- ret = unprotect_dsmos_segment(scp->fileoff,
- scp->filesize,
- vp,
- pager_offset,
- map,
- map_addr,
- map_size);
+ 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 (LOAD_SUCCESS == ret && filetype == MH_DYLINKER &&
- result->all_image_info_addr == MACH_VM_MIN_ADDRESS)
+
+ 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);
+ LC_SEGMENT_64 == lcp->cmd,
+ single_section_size,
+ ((const char *)lcp +
+ segment_command_size),
+ slide,
+ result);
+ }
if (result->entry_point != MACH_VM_MIN_ADDRESS) {
- if ((result->entry_point >= map_addr) && (result->entry_point < (map_addr + map_size))) {
+ 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 {
/* kernel does *not* use entryoff from LC_MAIN. Dyld uses it. */
result->needs_dynlinker = TRUE;
result->using_lcmain = TRUE;
-
- ret = thread_state_initialize( thread );
- if (ret != KERN_SUCCESS) {
- return(LOAD_FAILURE);
- }
-
result->unixproc = TRUE;
result->thread_count++;
result->entry_point += slide;
ret = load_threadstate(thread,
- (uint32_t *)(((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);
load_threadstate(
thread_t thread,
uint32_t *ts,
- uint32_t total_size
+ uint32_t total_size,
+ load_result_t *result
)
{
- kern_return_t ret;
uint32_t size;
int flavor;
uint32_t thread_size;
- uint32_t *local_ts;
- uint32_t local_ts_size;
+ uint32_t *local_ts = NULL;
+ uint32_t local_ts_size = 0;
+ int ret;
- local_ts = NULL;
- local_ts_size = 0;
+ (void)thread;
- ret = thread_state_initialize( thread );
- if (ret != KERN_SUCCESS) {
- ret = LOAD_FAILURE;
- goto done;
- }
-
if (total_size > 0) {
local_ts_size = total_size;
local_ts = kalloc(local_ts_size);
if (local_ts == NULL) {
- ret = LOAD_FAILURE;
- goto done;
+ return LOAD_FAILURE;
}
memcpy(local_ts, ts, local_ts_size);
ts = local_ts;
}
/*
- * 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++;
- if (UINT32_MAX-2 < size ||
- UINT32_MAX/sizeof(uint32_t) < size+2) {
- ret = LOAD_BADMACHO;
- goto done;
- }
- thread_size = (size+2)*sizeof(uint32_t);
- if (thread_size > total_size) {
+
+ 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 done;
- }
- 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) {
- ret = LOAD_FAILURE;
- goto done;
+ goto bad;
}
+
ts += size; /* ts is a (uint32_t *) */
}
- ret = LOAD_SUCCESS;
-done:
- if (local_ts != NULL) {
+ result->threadstate = local_ts;
+ result->threadstate_sz = local_ts_size;
+ return LOAD_SUCCESS;
+
+bad:
+ if (local_ts) {
kfree(local_ts, local_ts_size);
- local_ts = NULL;
}
return ret;
}
}
}
- if (ret == LOAD_SUCCESS) {
+ 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;
+
result->dynlinker = TRUE;
result->entry_point = myresult->entry_point;
result->validentry = myresult->validentry;
cputype,
macho_offset,
addr,
- lcp->datasize,
- 0)) {
+ lcp->datasize,
+ 0,
+ &blob)) {
ret = LOAD_FAILURE;
goto out;
} else {
ubc_cs_validation_bitmap_allocate( vp );
#endif
- blob = ubc_cs_blob_get(vp, cputype, macho_offset);
-
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;
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,
- cpu_type_t cputype,
- cpu_subtype_t cpusubtype)
+ 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 result, len;
+ int error, len;
pager_crypt_info_t crypt_info;
const char * cryptname = 0;
char *vpath;
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;
if(vpath == NULL) return LOAD_FAILURE;
len = MAXPATHLEN;
- result = vn_getpath(vp, vpath, &len);
- if(result) {
+ error = vn_getpath(vp, vpath, &len);
+ if (error) {
FREE_ZONE(vpath, MAXPATHLEN, M_NAMEI);
return LOAD_FAILURE;
}
.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) {
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:
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;
}
}
remap_now:
/* now remap using the decrypter */
- kr = vm_map_apple_protected(map, map_offset, map_offset+map_size, &crypt_info);
- if(kr) {
+ 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);
- crypt_info.crypt_end(crypt_info.crypt_ops);
return LOAD_PROTECT;
}
projects / apple / xnu.git / blobdiff