X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/cc8bc92ae4a8e9f1a1ab61bf83d34ad8150b3405..0a7de7458d150b5d4dffc935ba399be265ef0a1a:/bsd/kern/kern_exec.c diff --git a/bsd/kern/kern_exec.c b/bsd/kern/kern_exec.c index df43f2013..fea51a172 100644 --- a/bsd/kern/kern_exec.c +++ b/bsd/kern/kern_exec.c @@ -2,7 +2,7 @@ * Copyright (c) 2000-2013 Apple Inc. All rights reserved. * * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ - * + * * This file contains Original Code and/or Modifications of Original Code * as defined in and that are subject to the Apple Public Source License * Version 2.0 (the 'License'). You may not use this file except in @@ -11,10 +11,10 @@ * unlawful or unlicensed copies of an Apple operating system, or to * circumvent, violate, or enable the circumvention or violation of, any * terms of an Apple operating system software license agreement. - * + * * Please obtain a copy of the License at * http://www.opensource.apple.com/apsl/ and read it before using this file. - * + * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, @@ -22,7 +22,7 @@ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. * Please see the License for the specific language governing rights and * limitations under the License. - * + * * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */ @@ -32,7 +32,7 @@ * All rights reserved. The CMU software License Agreement specifies * the terms and conditions for use and redistribution. */ - + /*- * Copyright (c) 1982, 1986, 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -92,7 +92,7 @@ #include #include #include -#include +#include #include #include #include @@ -105,9 +105,9 @@ #include #include #if SYSV_SHM -#include /* shmexec() */ +#include /* shmexec() */ #endif -#include /* ubc_map() */ +#include /* ubc_map() */ #include #include #include @@ -162,6 +162,10 @@ #include #endif +#include + +extern boolean_t vm_darkwake_mode; + #if CONFIG_DTRACE /* Do not include dtrace.h, it redefines kmem_[alloc/free] */ extern void dtrace_proc_exec(proc_t); @@ -177,7 +181,13 @@ static void (*dtrace_proc_waitfor_hook)(proc_t) = NULL; #endif /* support for child creation in exec after vfork */ -thread_t fork_create_child(task_t parent_task, coalition_t *parent_coalition, proc_t child_proc, int inherit_memory, int is64bit, int in_exec); +thread_t fork_create_child(task_t parent_task, + coalition_t *parent_coalition, + proc_t child_proc, + int inherit_memory, + int is_64bit_addr, + int is_64bit_data, + int in_exec); void vfork_exit(proc_t p, int rv); extern void proc_apply_task_networkbg_internal(proc_t, thread_t); extern void task_set_did_exec_flag(task_t task); @@ -192,15 +202,15 @@ extern void ipc_importance_release(void *elem); /* * Mach things for which prototypes are unavailable from Mach headers */ -void ipc_task_reset( - task_t task); -void ipc_thread_reset( - thread_t thread); +void ipc_task_reset( + task_t task); +void ipc_thread_reset( + thread_t thread); kern_return_t ipc_object_copyin( - ipc_space_t space, - mach_port_name_t name, - mach_msg_type_name_t msgt_name, - ipc_object_t *objectp); + ipc_space_t space, + mach_port_name_t name, + mach_msg_type_name_t msgt_name, + ipc_object_t *objectp); void ipc_port_release_send(ipc_port_t); #if DEVELOPMENT || DEBUG @@ -229,7 +239,7 @@ __attribute__((noinline)) int __EXEC_WAITING_ON_TASKGATED_CODE_SIGNATURE_UPCALL_ * activator in exec_activate_image() before treating * it as malformed/corrupt. */ -#define EAI_ITERLIMIT 3 +#define EAI_ITERLIMIT 3 /* * For #! interpreter parsing @@ -239,22 +249,23 @@ __attribute__((noinline)) int __EXEC_WAITING_ON_TASKGATED_CODE_SIGNATURE_UPCALL_ extern vm_map_t bsd_pageable_map; extern const struct fileops vnops; +extern int nextpidversion; -#define USER_ADDR_ALIGN(addr, val) \ +#define USER_ADDR_ALIGN(addr, val) \ ( ( (user_addr_t)(addr) + (val) - 1) \ - & ~((val) - 1) ) + & ~((val) - 1) ) - /* Platform Code Exec Logging */ +/* Platform Code Exec Logging */ static int platform_exec_logging = 0; SYSCTL_DECL(_security_mac); SYSCTL_INT(_security_mac, OID_AUTO, platform_exec_logging, CTLFLAG_RW, &platform_exec_logging, 0, - "log cdhashes for all platform binary executions"); + "log cdhashes for all platform binary executions"); static os_log_t peLog = OS_LOG_DEFAULT; -struct image_params; /* Forward */ +struct image_params; /* Forward */ static int exec_activate_image(struct image_params *imgp); static int exec_copyout_strings(struct image_params *imgp, user_addr_t *stackp); static int load_return_to_errno(load_return_t lrtn); @@ -265,7 +276,7 @@ static int exec_extract_strings(struct image_params *imgp); static int exec_add_apple_strings(struct image_params *imgp, const load_result_t *load_result); static int exec_handle_sugid(struct image_params *imgp); static int sugid_scripts = 0; -SYSCTL_INT (_kern, OID_AUTO, sugid_scripts, CTLFLAG_RW | CTLFLAG_LOCKED, &sugid_scripts, 0, ""); +SYSCTL_INT(_kern, OID_AUTO, sugid_scripts, CTLFLAG_RW | CTLFLAG_LOCKED, &sugid_scripts, 0, ""); static kern_return_t create_unix_stack(vm_map_t map, load_result_t* load_result, proc_t p); static int copyoutptr(user_addr_t ua, user_addr_t ptr, int ptr_size); static void exec_resettextvp(proc_t, struct image_params *); @@ -273,7 +284,7 @@ static int check_for_signature(proc_t, struct image_params *); static void exec_prefault_data(proc_t, struct image_params *, load_result_t *); static errno_t exec_handle_port_actions(struct image_params *imgp, boolean_t * portwatch_present, ipc_port_t * portwatch_ports); static errno_t exec_handle_spawnattr_policy(proc_t p, int psa_apptype, uint64_t psa_qos_clamp, uint64_t psa_darwin_role, - ipc_port_t * portwatch_ports, int portwatch_count); + ipc_port_t * portwatch_ports, int portwatch_count); /* * exec_add_user_string @@ -297,35 +308,36 @@ static int exec_add_user_string(struct image_params *imgp, user_addr_t str, int seg, boolean_t is_ncargs) { int error = 0; - + do { size_t len = 0; int space; - - if (is_ncargs) + + if (is_ncargs) { space = imgp->ip_argspace; /* by definition smaller than ip_strspace */ - else + } else { space = imgp->ip_strspace; - + } + if (space <= 0) { error = E2BIG; break; } - + if (!UIO_SEG_IS_USER_SPACE(seg)) { - char *kstr = CAST_DOWN(char *,str); /* SAFE */ + char *kstr = CAST_DOWN(char *, str); /* SAFE */ error = copystr(kstr, imgp->ip_strendp, space, &len); - } else { + } else { error = copyinstr(str, imgp->ip_strendp, space, &len); } imgp->ip_strendp += len; imgp->ip_strspace -= len; - if (is_ncargs) + if (is_ncargs) { imgp->ip_argspace -= len; - + } } while (error == ENAMETOOLONG); - + return error; } @@ -333,7 +345,7 @@ exec_add_user_string(struct image_params *imgp, user_addr_t str, int seg, boolea * dyld is now passed the executable path as a getenv-like variable * in the same fashion as the stack_guard and malloc_entropy keys. */ -#define EXECUTABLE_KEY "executable_path=" +#define EXECUTABLE_KEY "executable_path=" /* * exec_save_path @@ -382,13 +394,13 @@ exec_save_path(struct image_params *imgp, user_addr_t path, int seg, const char len = MIN(MAXPATHLEN, imgp->ip_strspace); - switch(seg) { + switch (seg) { case UIO_USERSPACE32: - case UIO_USERSPACE64: /* Same for copyin()... */ + case UIO_USERSPACE64: /* Same for copyin()... */ error = copyinstr(path, imgp->ip_strings + strlen(EXECUTABLE_KEY), len, &len); break; case UIO_SYSSPACE: - kpath = CAST_DOWN(char *,path); /* SAFE */ + kpath = CAST_DOWN(char *, path); /* SAFE */ error = copystr(kpath, imgp->ip_strings + strlen(EXECUTABLE_KEY), len, &len); break; default: @@ -408,7 +420,7 @@ exec_save_path(struct image_params *imgp, user_addr_t path, int seg, const char } } - return(error); + return error; } /* @@ -416,7 +428,7 @@ exec_save_path(struct image_params *imgp, user_addr_t path, int seg, const char * * If we detect a shell script, we need to reset the string area * state so that the interpreter can be saved onto the stack. - + * * Parameters; struct image_params * image parameter block * * Returns: int 0 Success @@ -433,9 +445,9 @@ exec_reset_save_path(struct image_params *imgp) { imgp->ip_strendp = imgp->ip_strings; imgp->ip_argspace = NCARGS; - imgp->ip_strspace = ( NCARGS + PAGE_SIZE ); + imgp->ip_strspace = (NCARGS + PAGE_SIZE); - return (0); + return 0; } /* @@ -474,12 +486,12 @@ exec_shell_imgact(struct image_params *imgp) if (vdata[0] != '#' || vdata[1] != '!' || (imgp->ip_flags & IMGPF_INTERPRET) != 0) { - return (-1); + return -1; } if (imgp->ip_origcputype != 0) { /* Fat header previously matched, don't allow shell script inside */ - return (-1); + return -1; } imgp->ip_flags |= IMGPF_INTERPRET; @@ -495,10 +507,10 @@ exec_shell_imgact(struct image_params *imgp) } /* Try to find the first non-whitespace character */ - for( ihp = &vdata[2]; ihp < &vdata[IMG_SHSIZE]; ihp++ ) { + for (ihp = &vdata[2]; ihp < &vdata[IMG_SHSIZE]; ihp++) { if (IS_EOL(*ihp)) { /* Did not find interpreter, "#!\n" */ - return (ENOEXEC); + return ENOEXEC; } else if (IS_WHITESPACE(*ihp)) { /* Whitespace, like "#! /bin/sh\n", keep going. */ } else { @@ -509,13 +521,13 @@ exec_shell_imgact(struct image_params *imgp) if (ihp == &vdata[IMG_SHSIZE]) { /* All whitespace, like "#! " */ - return (ENOEXEC); + return ENOEXEC; } line_startp = ihp; /* Try to find the end of the interpreter+args string */ - for ( ; ihp < &vdata[IMG_SHSIZE]; ihp++ ) { + for (; ihp < &vdata[IMG_SHSIZE]; ihp++) { if (IS_EOL(*ihp)) { /* Got it */ break; @@ -526,7 +538,7 @@ exec_shell_imgact(struct image_params *imgp) if (ihp == &vdata[IMG_SHSIZE]) { /* A long line, like "#! blah blah blah" without end */ - return (ENOEXEC); + return ENOEXEC; } /* Backtrack until we find the last non-whitespace */ @@ -546,18 +558,20 @@ exec_shell_imgact(struct image_params *imgp) /* copy the interpreter name */ interp = imgp->ip_interp_buffer; - for ( ihp = line_startp; (ihp < line_endp) && !IS_WHITESPACE(*ihp); ihp++) + for (ihp = line_startp; (ihp < line_endp) && !IS_WHITESPACE(*ihp); ihp++) { *interp++ = *ihp; + } *interp = '\0'; exec_reset_save_path(imgp); exec_save_path(imgp, CAST_USER_ADDR_T(imgp->ip_interp_buffer), - UIO_SYSSPACE, NULL); + UIO_SYSSPACE, NULL); /* Copy the entire interpreter + args for later processing into argv[] */ interp = imgp->ip_interp_buffer; - for ( ihp = line_startp; (ihp < line_endp); ihp++) + for (ihp = line_startp; (ihp < line_endp); ihp++) { *interp++ = *ihp; + } *interp = '\0'; #if !SECURE_KERNEL @@ -574,13 +588,14 @@ exec_shell_imgact(struct image_params *imgp) p = vfs_context_proc(imgp->ip_vfs_context); error = falloc(p, &fp, &fd, imgp->ip_vfs_context); - if (error) - return(error); + if (error) { + return error; + } fp->f_fglob->fg_flag = FREAD; fp->f_fglob->fg_ops = &vnops; fp->f_fglob->fg_data = (caddr_t)imgp->ip_vp; - + proc_fdlock(p); procfdtbl_releasefd(p, fd, NULL); fp_drop(p, fd, fp, 1); @@ -591,7 +606,7 @@ exec_shell_imgact(struct image_params *imgp) } #endif - return (-3); + return -3; } @@ -617,7 +632,7 @@ exec_shell_imgact(struct image_params *imgp) * activators should not be given the opportunity to attempt * to activate the image. * - * If we find an encapsulated binary, we make no assertions + * If we find an encapsulated binary, we make no assertions * about its validity; instead, we leave that up to a rescan * for an activator to claim it, and, if it is claimed by one, * that activator is responsible for determining validity. @@ -672,9 +687,9 @@ exec_fat_imgact(struct image_params *imgp) } lret = fatfile_getbestarch_for_cputype(pref, - (vm_offset_t)fat_header, - PAGE_SIZE, - &fat_arch); + (vm_offset_t)fat_header, + PAGE_SIZE, + &fat_arch); if (lret == LOAD_SUCCESS) { goto use_arch; } @@ -688,8 +703,8 @@ exec_fat_imgact(struct image_params *imgp) regular_grading: /* Look up our preferred architecture in the fat file. */ lret = fatfile_getbestarch((vm_offset_t)fat_header, - PAGE_SIZE, - &fat_arch); + PAGE_SIZE, + &fat_arch); if (lret != LOAD_SUCCESS) { error = load_return_to_errno(lret); goto bad; @@ -698,9 +713,9 @@ regular_grading: use_arch: /* Read the Mach-O header out of fat_arch */ error = vn_rdwr(UIO_READ, imgp->ip_vp, imgp->ip_vdata, - PAGE_SIZE, fat_arch.offset, - UIO_SYSSPACE, (IO_UNIT|IO_NODELOCKED), - cred, &resid, p); + PAGE_SIZE, fat_arch.offset, + UIO_SYSSPACE, (IO_UNIT | IO_NODELOCKED), + cred, &resid, p); if (error) { goto bad; } @@ -718,7 +733,7 @@ use_arch: bad: kauth_cred_unref(&cred); - return (error); + return error; } static int @@ -727,11 +742,10 @@ activate_exec_state(task_t task, proc_t p, thread_t thread, load_result_t *resul int ret; task_set_dyld_info(task, MACH_VM_MIN_ADDRESS, 0); - if (result->is64bit) { - task_set_64bit(task, TRUE); + task_set_64bit(task, result->is_64bit_addr, result->is_64bit_data); + if (result->is_64bit_addr) { OSBitOrAtomic(P_LP64, &p->p_flag); } else { - task_set_64bit(task, FALSE); OSBitAndAtomic(~((uint32_t)P_LP64), &p->p_flag); } @@ -776,7 +790,7 @@ set_proc_name(struct image_params *imgp, proc_t p) } bcopy((caddr_t)imgp->ip_ndp->ni_cnd.cn_nameptr, (caddr_t)p->p_name, - (unsigned)imgp->ip_ndp->ni_cnd.cn_namelen); + (unsigned)imgp->ip_ndp->ni_cnd.cn_namelen); p->p_name[imgp->ip_ndp->ni_cnd.cn_namelen] = '\0'; if (imgp->ip_ndp->ni_cnd.cn_namelen > MAXCOMLEN) { @@ -784,19 +798,10 @@ set_proc_name(struct image_params *imgp, proc_t p) } bcopy((caddr_t)imgp->ip_ndp->ni_cnd.cn_nameptr, (caddr_t)p->p_comm, - (unsigned)imgp->ip_ndp->ni_cnd.cn_namelen); + (unsigned)imgp->ip_ndp->ni_cnd.cn_namelen); p->p_comm[imgp->ip_ndp->ni_cnd.cn_namelen] = '\0'; } -static uint64_t get_va_fsid(struct vnode_attr *vap) -{ - if (VATTR_IS_SUPPORTED(vap, va_fsid64)) { - return *(uint64_t *)&vap->va_fsid64; - } else { - return vap->va_fsid; - } -} - /* * exec_mach_imgact * @@ -824,28 +829,28 @@ static int exec_mach_imgact(struct image_params *imgp) { struct mach_header *mach_header = (struct mach_header *)imgp->ip_vdata; - proc_t p = vfs_context_proc(imgp->ip_vfs_context); - int error = 0; - task_t task; - task_t new_task = NULL; /* protected by vfexec */ - thread_t thread; - struct uthread *uthread; + proc_t p = vfs_context_proc(imgp->ip_vfs_context); + int error = 0; + task_t task; + task_t new_task = NULL; /* protected by vfexec */ + thread_t thread; + struct uthread *uthread; vm_map_t old_map = VM_MAP_NULL; vm_map_t map = VM_MAP_NULL; - load_return_t lret; - load_result_t load_result; + load_return_t lret; + load_result_t load_result = {}; struct _posix_spawnattr *psa = NULL; - int spawn = (imgp->ip_flags & IMGPF_SPAWN); - int vfexec = (imgp->ip_flags & IMGPF_VFORK_EXEC); - int exec = (imgp->ip_flags & IMGPF_EXEC); - os_reason_t exec_failure_reason = OS_REASON_NULL; + int spawn = (imgp->ip_flags & IMGPF_SPAWN); + int vfexec = (imgp->ip_flags & IMGPF_VFORK_EXEC); + int exec = (imgp->ip_flags & IMGPF_EXEC); + os_reason_t exec_failure_reason = OS_REASON_NULL; /* * make sure it's a Mach-O 1.0 or Mach-O 2.0 binary; the difference * is a reserved field on the end, so for the most part, we can * treat them as if they were identical. Reverse-endian Mach-O * binaries are recognized but not compatible. - */ + */ if ((mach_header->magic == MH_CIGAM) || (mach_header->magic == MH_CIGAM_64)) { error = EBADARCH; @@ -866,7 +871,7 @@ exec_mach_imgact(struct image_params *imgp) if (imgp->ip_origcputype != 0) { /* Fat header previously had an idea about this thin file */ if (imgp->ip_origcputype != mach_header->cputype || - imgp->ip_origcpusubtype != mach_header->cpusubtype) { + imgp->ip_origcpusubtype != mach_header->cpusubtype) { error = EBADARCH; goto bad; } @@ -879,8 +884,9 @@ exec_mach_imgact(struct image_params *imgp) thread = current_thread(); uthread = get_bsdthread_info(thread); - if ((mach_header->cputype & CPU_ARCH_ABI64) == CPU_ARCH_ABI64) - imgp->ip_flags |= IMGPF_IS_64BIT; + if ((mach_header->cputype & CPU_ARCH_ABI64) == CPU_ARCH_ABI64) { + imgp->ip_flags |= IMGPF_IS_64BIT_ADDR | IMGPF_IS_64BIT_DATA; + } /* If posix_spawn binprefs exist, respect those prefs. */ psa = (struct _posix_spawnattr *) imgp->ip_px_sa; @@ -913,12 +919,14 @@ grade: goto bad; } + /* Copy in arguments/environment from the old process */ error = exec_extract_strings(imgp); - if (error) + if (error) { goto bad; + } - AUDIT_ARG(argv, imgp->ip_startargv, imgp->ip_argc, + AUDIT_ARG(argv, imgp->ip_startargv, imgp->ip_argc, imgp->ip_endargv - imgp->ip_startargv); AUDIT_ARG(envv, imgp->ip_endargv, imgp->ip_envc, imgp->ip_endenvv - imgp->ip_endargv); @@ -931,7 +939,13 @@ grade: * new child process. */ if (vfexec) { - imgp->ip_new_thread = fork_create_child(task, NULL, p, FALSE, (imgp->ip_flags & IMGPF_IS_64BIT), FALSE); + imgp->ip_new_thread = fork_create_child(task, + NULL, + p, + FALSE, + (imgp->ip_flags & IMGPF_IS_64BIT_ADDR), + (imgp->ip_flags & IMGPF_IS_64BIT_DATA), + FALSE); /* task and thread ref returned, will be released in __mac_execve */ if (imgp->ip_new_thread == NULL) { error = ENOMEM; @@ -965,7 +979,7 @@ grade: error = load_return_to_errno(lret); KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_PROC, BSD_PROC_EXITREASON_CREATE) | DBG_FUNC_NONE, - p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_BAD_MACHO, 0, 0); + p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_BAD_MACHO, 0, 0); if (lret == LOAD_BADMACHO_UPX) { /* set anything that might be useful in the crash report */ set_proc_name(imgp, p); @@ -973,6 +987,13 @@ grade: exec_failure_reason = os_reason_create(OS_REASON_EXEC, EXEC_EXIT_REASON_UPX); exec_failure_reason->osr_flags |= OS_REASON_FLAG_GENERATE_CRASH_REPORT; exec_failure_reason->osr_flags |= OS_REASON_FLAG_CONSISTENT_FAILURE; + } else if (lret == LOAD_BADARCH_X86) { + /* set anything that might be useful in the crash report */ + set_proc_name(imgp, p); + + exec_failure_reason = os_reason_create(OS_REASON_EXEC, EXEC_EXIT_REASON_NO32EXEC); + exec_failure_reason->osr_flags |= OS_REASON_FLAG_GENERATE_CRASH_REPORT; + exec_failure_reason->osr_flags |= OS_REASON_FLAG_CONSISTENT_FAILURE; } else { exec_failure_reason = os_reason_create(OS_REASON_EXEC, EXEC_EXIT_REASON_BAD_MACHO); } @@ -987,40 +1008,48 @@ grade: vm_map_set_user_wire_limit(map, p->p_rlimit[RLIMIT_MEMLOCK].rlim_cur); - /* + /* * Set code-signing flags if this binary is signed, or if parent has * requested them on exec. */ if (load_result.csflags & CS_VALID) { - imgp->ip_csflags |= load_result.csflags & - (CS_VALID|CS_SIGNED|CS_DEV_CODE| - CS_HARD|CS_KILL|CS_RESTRICT|CS_ENFORCEMENT|CS_REQUIRE_LV| - CS_ENTITLEMENTS_VALIDATED|CS_DYLD_PLATFORM| - CS_ENTITLEMENT_FLAGS| - CS_EXEC_SET_HARD|CS_EXEC_SET_KILL|CS_EXEC_SET_ENFORCEMENT); + imgp->ip_csflags |= load_result.csflags & + (CS_VALID | CS_SIGNED | CS_DEV_CODE | + CS_HARD | CS_KILL | CS_RESTRICT | CS_ENFORCEMENT | CS_REQUIRE_LV | + CS_FORCED_LV | CS_ENTITLEMENTS_VALIDATED | CS_DYLD_PLATFORM | CS_RUNTIME | + CS_ENTITLEMENT_FLAGS | + CS_EXEC_SET_HARD | CS_EXEC_SET_KILL | CS_EXEC_SET_ENFORCEMENT); } else { imgp->ip_csflags &= ~CS_VALID; } - if (p->p_csflags & CS_EXEC_SET_HARD) + if (p->p_csflags & CS_EXEC_SET_HARD) { imgp->ip_csflags |= CS_HARD; - if (p->p_csflags & CS_EXEC_SET_KILL) + } + if (p->p_csflags & CS_EXEC_SET_KILL) { imgp->ip_csflags |= CS_KILL; - if (p->p_csflags & CS_EXEC_SET_ENFORCEMENT) + } + if (p->p_csflags & CS_EXEC_SET_ENFORCEMENT) { imgp->ip_csflags |= CS_ENFORCEMENT; + } if (p->p_csflags & CS_EXEC_INHERIT_SIP) { - if (p->p_csflags & CS_INSTALLER) + if (p->p_csflags & CS_INSTALLER) { imgp->ip_csflags |= CS_INSTALLER; - if (p->p_csflags & CS_DATAVAULT_CONTROLLER) + } + if (p->p_csflags & CS_DATAVAULT_CONTROLLER) { imgp->ip_csflags |= CS_DATAVAULT_CONTROLLER; - if (p->p_csflags & CS_NVRAM_UNRESTRICTED) + } + if (p->p_csflags & CS_NVRAM_UNRESTRICTED) { imgp->ip_csflags |= CS_NVRAM_UNRESTRICTED; + } } /* * Set up the system reserved areas in the new address space. */ - vm_map_exec(map, task, load_result.is64bit, (void *)p->p_fd->fd_rdir, cpu_type()); + int cpu_subtype; + cpu_subtype = 0; /* all cpu_subtypes use the same shared region */ + vm_map_exec(map, task, load_result.is_64bit_addr, (void *)p->p_fd->fd_rdir, cpu_type(), cpu_subtype); /* * Close file descriptors which specify close-on-exec. @@ -1035,7 +1064,7 @@ grade: vm_map_deallocate(map); KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_PROC, BSD_PROC_EXITREASON_CREATE) | DBG_FUNC_NONE, - p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_SUGID_FAILURE, 0, 0); + p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_SUGID_FAILURE, 0, 0); exec_failure_reason = os_reason_create(OS_REASON_EXEC, EXEC_EXIT_REASON_SUGID_FAILURE); goto badtoolate; } @@ -1058,9 +1087,8 @@ grade: lret = activate_exec_state(task, p, thread, &load_result); if (lret != KERN_SUCCESS) { - KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_PROC, BSD_PROC_EXITREASON_CREATE) | DBG_FUNC_NONE, - p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_ACTV_THREADSTATE, 0, 0); + p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_ACTV_THREADSTATE, 0, 0); exec_failure_reason = os_reason_create(OS_REASON_EXEC, EXEC_EXIT_REASON_ACTV_THREADSTATE); goto badtoolate; } @@ -1068,30 +1096,31 @@ grade: /* * deal with voucher on exec-calling thread. */ - if (imgp->ip_new_thread == NULL) + if (imgp->ip_new_thread == NULL) { thread_set_mach_voucher(current_thread(), IPC_VOUCHER_NULL); + } /* Make sure we won't interrupt ourself signalling a partial process */ - if (!vfexec && !spawn && (p->p_lflag & P_LTRACED)) + if (!vfexec && !spawn && (p->p_lflag & P_LTRACED)) { psignal(p, SIGTRAP); + } if (load_result.unixproc && - create_unix_stack(get_task_map(task), - &load_result, - p) != KERN_SUCCESS) { + create_unix_stack(get_task_map(task), + &load_result, + p) != KERN_SUCCESS) { error = load_return_to_errno(LOAD_NOSPACE); KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_PROC, BSD_PROC_EXITREASON_CREATE) | DBG_FUNC_NONE, - p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_STACK_ALLOC, 0, 0); + p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_STACK_ALLOC, 0, 0); exec_failure_reason = os_reason_create(OS_REASON_EXEC, EXEC_EXIT_REASON_STACK_ALLOC); goto badtoolate; } error = exec_add_apple_strings(imgp, &load_result); if (error) { - KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_PROC, BSD_PROC_EXITREASON_CREATE) | DBG_FUNC_NONE, - p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_APPLE_STRING_INIT, 0, 0); + p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_APPLE_STRING_INIT, 0, 0); exec_failure_reason = os_reason_create(OS_REASON_EXEC, EXEC_EXIT_REASON_APPLE_STRING_INIT); goto badtoolate; } @@ -1100,7 +1129,7 @@ grade: old_map = vm_map_switch(get_task_map(task)); if (load_result.unixproc) { - user_addr_t ap; + user_addr_t ap; /* * Copy the strings area out into the new process address @@ -1112,7 +1141,7 @@ grade: vm_map_switch(old_map); KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_PROC, BSD_PROC_EXITREASON_CREATE) | DBG_FUNC_NONE, - p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_COPYOUT_STRINGS, 0, 0); + p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_COPYOUT_STRINGS, 0, 0); exec_failure_reason = os_reason_create(OS_REASON_EXEC, EXEC_EXIT_REASON_COPYOUT_STRINGS); goto badtoolate; } @@ -1121,8 +1150,8 @@ grade: } if (load_result.dynlinker) { - uint64_t ap; - int new_ptr_size = (imgp->ip_flags & IMGPF_IS_64BIT) ? 8 : 4; + uint64_t ap; + int new_ptr_size = (imgp->ip_flags & IMGPF_IS_64BIT_ADDR) ? 8 : 4; /* Adjust the stack */ ap = thread_adjuserstack(thread, -new_ptr_size); @@ -1132,7 +1161,7 @@ grade: vm_map_switch(old_map); KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_PROC, BSD_PROC_EXITREASON_CREATE) | DBG_FUNC_NONE, - p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_COPYOUT_DYNLINKER, 0, 0); + p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_COPYOUT_DYNLINKER, 0, 0); exec_failure_reason = os_reason_create(OS_REASON_EXEC, EXEC_EXIT_REASON_COPYOUT_DYNLINKER); goto badtoolate; } @@ -1161,8 +1190,9 @@ grade: #if SYSV_SHM /* FIXME: Till vmspace inherit is fixed: */ - if (!vfexec && p->vm_shm) + if (!vfexec && p->vm_shm) { shmexec(p); + } #endif #if SYSV_SEM /* Clean up the semaphores */ @@ -1180,20 +1210,30 @@ grade: if (secluded_for_apps && load_result.platform_binary) { if (strncmp(p->p_name, - "Camera", - sizeof (p->p_name)) == 0) { + "Camera", + sizeof(p->p_name)) == 0) { task_set_could_use_secluded_mem(task, TRUE); } else { task_set_could_use_secluded_mem(task, FALSE); } if (strncmp(p->p_name, - "mediaserverd", - sizeof (p->p_name)) == 0) { + "mediaserverd", + sizeof(p->p_name)) == 0) { task_set_could_also_use_secluded_mem(task, TRUE); } } #endif /* CONFIG_SECLUDED_MEMORY */ +#if __arm64__ + if (load_result.legacy_footprint) { +#if DEVELOPMENT || DEBUG + printf("%s: %d[%s] legacy footprint (mach-o)\n", + __FUNCTION__, p->p_pid, p->p_name); +#endif /* DEVELOPMENT || DEBUG */ + task_set_legacy_footprint(task, TRUE); + } +#endif /* __arm64__ */ + pal_dbg_set_task_name(task); /* @@ -1234,16 +1274,11 @@ grade: #endif if (kdebug_enable) { - long dbg_arg1, dbg_arg2, dbg_arg3, dbg_arg4; - - /* - * Collect the pathname for tracing - */ - kdbg_trace_string(p, &dbg_arg1, &dbg_arg2, &dbg_arg3, &dbg_arg4); + long args[4] = {}; uintptr_t fsid = 0, fileid = 0; if (imgp->ip_vattr) { - uint64_t fsid64 = get_va_fsid(imgp->ip_vattr); + uint64_t fsid64 = vnode_get_va_fsid(imgp->ip_vattr); fsid = fsid64; fileid = imgp->ip_vattr->va_fileid; // check for (unexpected) overflow and trace zero in that case @@ -1251,10 +1286,15 @@ grade: fsid = fileid = 0; } } - KERNEL_DEBUG_CONSTANT1(TRACE_DATA_EXEC | DBG_FUNC_NONE, - p->p_pid , fsid, fileid, 0, (uintptr_t)thread_tid(thread)); - KERNEL_DEBUG_CONSTANT1(TRACE_STRING_EXEC | DBG_FUNC_NONE, - dbg_arg1, dbg_arg2, dbg_arg3, dbg_arg4, (uintptr_t)thread_tid(thread)); + KERNEL_DEBUG_CONSTANT_IST1(TRACE_DATA_EXEC, p->p_pid, fsid, fileid, 0, + (uintptr_t)thread_tid(thread)); + + /* + * Collect the pathname for tracing + */ + kdbg_trace_string(p, &args[0], &args[1], &args[2], &args[3]); + KERNEL_DEBUG_CONSTANT_IST1(TRACE_STRING_EXEC, args[0], args[1], + args[2], args[3], (uintptr_t)thread_tid(thread)); } /* @@ -1318,14 +1358,8 @@ badtoolate: os_reason_free(exec_failure_reason); exec_failure_reason = OS_REASON_NULL; } - -done: - if (!spawn) { - /* notify only if it has not failed due to FP Key error */ - if ((p->p_lflag & P_LTERM_DECRYPTFAIL) == 0) - proc_knote(p, NOTE_EXEC); - } +done: if (load_result.threadstate) { kfree(load_result.threadstate, load_result.threadstate_sz); load_result.threadstate = NULL; @@ -1334,7 +1368,7 @@ done: bad: /* If we hit this, we likely would have leaked an exit reason */ assert(exec_failure_reason == OS_REASON_NULL); - return(error); + return error; } @@ -1351,9 +1385,9 @@ struct execsw { int (*ex_imgact)(struct image_params *); const char *ex_name; } execsw[] = { - { exec_mach_imgact, "Mach-o Binary" }, - { exec_fat_imgact, "Fat Binary" }, - { exec_shell_imgact, "Interpreter Script" }, + { exec_mach_imgact, "Mach-o Binary" }, + { exec_fat_imgact, "Fat Binary" }, + { exec_shell_imgact, "Interpreter Script" }, { NULL, NULL} }; @@ -1392,15 +1426,16 @@ exec_activate_image(struct image_params *imgp) const char *excpath; int error; int resid; - int once = 1; /* save SGUID-ness for interpreted files */ + int once = 1; /* save SGUID-ness for interpreted files */ int i; int itercount = 0; proc_t p = vfs_context_proc(imgp->ip_vfs_context); error = execargs_alloc(imgp); - if (error) + if (error) { goto bad_notrans; - + } + error = exec_save_path(imgp, imgp->ip_user_fname, imgp->ip_seg, &excpath); if (error) { goto bad_notrans; @@ -1416,14 +1451,15 @@ exec_activate_image(struct image_params *imgp) } NDINIT(ndp, LOOKUP, OP_LOOKUP, FOLLOW | LOCKLEAF | AUDITVNPATH1, - UIO_SYSSPACE, CAST_USER_ADDR_T(excpath), imgp->ip_vfs_context); + UIO_SYSSPACE, CAST_USER_ADDR_T(excpath), imgp->ip_vfs_context); again: error = namei(ndp); - if (error) + if (error) { goto bad_notrans; - imgp->ip_ndp = ndp; /* successful namei(); call nameidone() later */ - imgp->ip_vp = ndp->ni_vp; /* if set, need to vnode_put() at some point */ + } + imgp->ip_ndp = ndp; /* successful namei(); call nameidone() later */ + imgp->ip_vp = ndp->ni_vp; /* if set, need to vnode_put() at some point */ /* * Before we start the transition from binary A to binary B, make @@ -1440,12 +1476,14 @@ again: } error = proc_transstart(p, 1, 0); proc_unlock(p); - if (error) + if (error) { goto bad_notrans; + } error = exec_check_permissions(imgp); - if (error) + if (error) { goto bad; + } /* Copy; avoid invocation of an interpreter overwriting the original */ if (once) { @@ -1454,11 +1492,12 @@ again: } error = vn_rdwr(UIO_READ, imgp->ip_vp, imgp->ip_vdata, PAGE_SIZE, 0, - UIO_SYSSPACE, IO_NODELOCKED, - vfs_context_ucred(imgp->ip_vfs_context), - &resid, vfs_context_proc(imgp->ip_vfs_context)); - if (error) + UIO_SYSSPACE, IO_NODELOCKED, + vfs_context_ucred(imgp->ip_vfs_context), + &resid, vfs_context_proc(imgp->ip_vfs_context)); + if (error) { goto bad; + } if (resid) { memset(imgp->ip_vdata + (PAGE_SIZE - resid), 0x0, resid); @@ -1471,50 +1510,52 @@ encapsulated_binary: goto bad; } error = -1; - for(i = 0; error == -1 && execsw[i].ex_imgact != NULL; i++) { - + for (i = 0; error == -1 && execsw[i].ex_imgact != NULL; i++) { error = (*execsw[i].ex_imgact)(imgp); switch (error) { /* case -1: not claimed: continue */ - case -2: /* Encapsulated binary, imgp->ip_XXX set for next iteration */ + case -2: /* Encapsulated binary, imgp->ip_XXX set for next iteration */ goto encapsulated_binary; - case -3: /* Interpreter */ + case -3: /* Interpreter */ #if CONFIG_MACF /* * Copy the script label for later use. Note that * the label can be different when the script is * actually read by the interpreter. */ - if (imgp->ip_scriptlabelp) + if (imgp->ip_scriptlabelp) { mac_vnode_label_free(imgp->ip_scriptlabelp); + } imgp->ip_scriptlabelp = mac_vnode_label_alloc(); if (imgp->ip_scriptlabelp == NULL) { error = ENOMEM; break; } mac_vnode_label_copy(imgp->ip_vp->v_label, - imgp->ip_scriptlabelp); + imgp->ip_scriptlabelp); /* * Take a ref of the script vnode for later use. */ - if (imgp->ip_scriptvp) + if (imgp->ip_scriptvp) { vnode_put(imgp->ip_scriptvp); - if (vnode_getwithref(imgp->ip_vp) == 0) + } + if (vnode_getwithref(imgp->ip_vp) == 0) { imgp->ip_scriptvp = imgp->ip_vp; + } #endif nameidone(ndp); vnode_put(imgp->ip_vp); - imgp->ip_vp = NULL; /* already put */ + imgp->ip_vp = NULL; /* already put */ imgp->ip_ndp = NULL; /* already nameidone */ /* Use excpath, which exec_shell_imgact reset to the interpreter */ NDINIT(ndp, LOOKUP, OP_LOOKUP, FOLLOW | LOCKLEAF, - UIO_SYSSPACE, CAST_USER_ADDR_T(excpath), imgp->ip_vfs_context); + UIO_SYSSPACE, CAST_USER_ADDR_T(excpath), imgp->ip_vfs_context); proc_transend(p, 0); goto again; @@ -1524,27 +1565,36 @@ encapsulated_binary: } } - /* - * Call out to allow 3rd party notification of exec. - * Ignore result of kauth_authorize_fileop call. - */ - if (error == 0 && kauth_authorize_fileop_has_listeners()) { - kauth_authorize_fileop(vfs_context_ucred(imgp->ip_vfs_context), - KAUTH_FILEOP_EXEC, - (uintptr_t)ndp->ni_vp, 0); + if (error == 0) { + if (imgp->ip_flags & IMGPF_INTERPRET && ndp->ni_vp) { + AUDIT_ARG(vnpath, ndp->ni_vp, ARG_VNODE2); + } + + /* + * Call out to allow 3rd party notification of exec. + * Ignore result of kauth_authorize_fileop call. + */ + if (kauth_authorize_fileop_has_listeners()) { + kauth_authorize_fileop(vfs_context_ucred(imgp->ip_vfs_context), + KAUTH_FILEOP_EXEC, + (uintptr_t)ndp->ni_vp, 0); + } } bad: proc_transend(p, 0); bad_notrans: - if (imgp->ip_strings) + if (imgp->ip_strings) { execargs_free(imgp); - if (imgp->ip_ndp) + } + if (imgp->ip_ndp) { nameidone(imgp->ip_ndp); - if (ndp) + } + if (ndp) { FREE(ndp, M_TEMP); + } - return (error); + return error; } @@ -1560,7 +1610,7 @@ bad_notrans: */ static errno_t exec_handle_spawnattr_policy(proc_t p, int psa_apptype, uint64_t psa_qos_clamp, uint64_t psa_darwin_role, - ipc_port_t * portwatch_ports, int portwatch_count) + ipc_port_t * portwatch_ports, int portwatch_count) { int apptype = TASK_APPTYPE_NONE; int qos_clamp = THREAD_QOS_UNSPECIFIED; @@ -1569,49 +1619,49 @@ exec_handle_spawnattr_policy(proc_t p, int psa_apptype, uint64_t psa_qos_clamp, if ((psa_apptype & POSIX_SPAWN_PROC_TYPE_MASK) != 0) { int proctype = psa_apptype & POSIX_SPAWN_PROC_TYPE_MASK; - switch(proctype) { - case POSIX_SPAWN_PROC_TYPE_DAEMON_INTERACTIVE: - apptype = TASK_APPTYPE_DAEMON_INTERACTIVE; - break; - case POSIX_SPAWN_PROC_TYPE_DAEMON_STANDARD: - apptype = TASK_APPTYPE_DAEMON_STANDARD; - break; - case POSIX_SPAWN_PROC_TYPE_DAEMON_ADAPTIVE: - apptype = TASK_APPTYPE_DAEMON_ADAPTIVE; - break; - case POSIX_SPAWN_PROC_TYPE_DAEMON_BACKGROUND: - apptype = TASK_APPTYPE_DAEMON_BACKGROUND; - break; - case POSIX_SPAWN_PROC_TYPE_APP_DEFAULT: - apptype = TASK_APPTYPE_APP_DEFAULT; - break; + switch (proctype) { + case POSIX_SPAWN_PROC_TYPE_DAEMON_INTERACTIVE: + apptype = TASK_APPTYPE_DAEMON_INTERACTIVE; + break; + case POSIX_SPAWN_PROC_TYPE_DAEMON_STANDARD: + apptype = TASK_APPTYPE_DAEMON_STANDARD; + break; + case POSIX_SPAWN_PROC_TYPE_DAEMON_ADAPTIVE: + apptype = TASK_APPTYPE_DAEMON_ADAPTIVE; + break; + case POSIX_SPAWN_PROC_TYPE_DAEMON_BACKGROUND: + apptype = TASK_APPTYPE_DAEMON_BACKGROUND; + break; + case POSIX_SPAWN_PROC_TYPE_APP_DEFAULT: + apptype = TASK_APPTYPE_APP_DEFAULT; + break; #if !CONFIG_EMBEDDED - case POSIX_SPAWN_PROC_TYPE_APP_TAL: - apptype = TASK_APPTYPE_APP_TAL; - break; + case POSIX_SPAWN_PROC_TYPE_APP_TAL: + apptype = TASK_APPTYPE_APP_TAL; + break; #endif /* !CONFIG_EMBEDDED */ - default: - apptype = TASK_APPTYPE_NONE; - /* TODO: Should an invalid value here fail the spawn? */ - break; + default: + apptype = TASK_APPTYPE_NONE; + /* TODO: Should an invalid value here fail the spawn? */ + break; } } if (psa_qos_clamp != POSIX_SPAWN_PROC_CLAMP_NONE) { switch (psa_qos_clamp) { - case POSIX_SPAWN_PROC_CLAMP_UTILITY: - qos_clamp = THREAD_QOS_UTILITY; - break; - case POSIX_SPAWN_PROC_CLAMP_BACKGROUND: - qos_clamp = THREAD_QOS_BACKGROUND; - break; - case POSIX_SPAWN_PROC_CLAMP_MAINTENANCE: - qos_clamp = THREAD_QOS_MAINTENANCE; - break; - default: - qos_clamp = THREAD_QOS_UNSPECIFIED; - /* TODO: Should an invalid value here fail the spawn? */ - break; + case POSIX_SPAWN_PROC_CLAMP_UTILITY: + qos_clamp = THREAD_QOS_UTILITY; + break; + case POSIX_SPAWN_PROC_CLAMP_BACKGROUND: + qos_clamp = THREAD_QOS_BACKGROUND; + break; + case POSIX_SPAWN_PROC_CLAMP_MAINTENANCE: + qos_clamp = THREAD_QOS_MAINTENANCE; + break; + default: + qos_clamp = THREAD_QOS_UNSPECIFIED; + /* TODO: Should an invalid value here fail the spawn? */ + break; } } @@ -1619,33 +1669,33 @@ exec_handle_spawnattr_policy(proc_t p, int psa_apptype, uint64_t psa_qos_clamp, proc_darwin_role_to_task_role(psa_darwin_role, &role); } - if (apptype != TASK_APPTYPE_NONE || + if (apptype != TASK_APPTYPE_NONE || qos_clamp != THREAD_QOS_UNSPECIFIED || - role != TASK_UNSPECIFIED) { + role != TASK_UNSPECIFIED) { proc_set_task_spawnpolicy(p->task, apptype, qos_clamp, role, - portwatch_ports, portwatch_count); + portwatch_ports, portwatch_count); } - return (0); + return 0; } /* * exec_handle_port_actions * - * Description: Go through the _posix_port_actions_t contents, - * calling task_set_special_port, task_set_exception_ports - * and/or audit_session_spawnjoin for the current task. + * Description: Go through the _posix_port_actions_t contents, + * calling task_set_special_port, task_set_exception_ports + * and/or audit_session_spawnjoin for the current task. * * Parameters: struct image_params * Image parameter block * * Returns: 0 Success - * EINVAL Failure - * ENOTSUP Illegal posix_spawn attr flag was set + * EINVAL Failure + * ENOTSUP Illegal posix_spawn attr flag was set */ static errno_t exec_handle_port_actions(struct image_params *imgp, boolean_t * portwatch_present, - ipc_port_t * portwatch_ports) + ipc_port_t * portwatch_ports) { _posix_spawn_port_actions_t pacts = imgp->ip_px_spa; #if CONFIG_AUDIT @@ -1665,8 +1715,8 @@ exec_handle_port_actions(struct image_params *imgp, boolean_t * portwatch_presen if (MACH_PORT_VALID(act->new_port)) { kr = ipc_object_copyin(get_task_ipcspace(current_task()), - act->new_port, MACH_MSG_TYPE_COPY_SEND, - (ipc_object_t *) &port); + act->new_port, MACH_MSG_TYPE_COPY_SEND, + (ipc_object_t *) &port); if (kr != KERN_SUCCESS) { ret = EINVAL; @@ -1681,15 +1731,17 @@ exec_handle_port_actions(struct image_params *imgp, boolean_t * portwatch_presen case PSPA_SPECIAL: kr = task_set_special_port(task, act->which, port); - if (kr != KERN_SUCCESS) + if (kr != KERN_SUCCESS) { ret = EINVAL; + } break; case PSPA_EXCEPTION: kr = task_set_exception_ports(task, act->mask, port, - act->behavior, act->flavor); - if (kr != KERN_SUCCESS) + act->behavior, act->flavor); + if (kr != KERN_SUCCESS) { ret = EINVAL; + } break; #if CONFIG_AUDIT case PSPA_AU_SESSION: @@ -1724,9 +1776,10 @@ exec_handle_port_actions(struct image_params *imgp, boolean_t * portwatch_presen } done: - if (0 != ret) + if (0 != ret) { DTRACE_PROC1(spawn__port__failure, mach_port_name_t, act->new_port); - return (ret); + } + return ret; } /* @@ -1754,12 +1807,12 @@ exec_handle_file_actions(struct image_params *imgp, short psa_flags) int action; proc_t p = vfs_context_proc(imgp->ip_vfs_context); _posix_spawn_file_actions_t px_sfap = imgp->ip_px_sfa; - int ival[2]; /* dummy retval for system calls) */ + int ival[2]; /* dummy retval for system calls) */ for (action = 0; action < px_sfap->psfa_act_count; action++) { - _psfa_action_t *psfa = &px_sfap->psfa_act_acts[ action]; + _psfa_action_t *psfa = &px_sfap->psfa_act_acts[action]; - switch(psfa->psfaa_type) { + switch (psfa->psfaa_type) { case PSFA_OPEN: { /* * Open is different, in that it requires the use of @@ -1788,19 +1841,19 @@ exec_handle_file_actions(struct image_params *imgp, short psa_flags) VATTR_INIT(vap); /* Mask off all but regular access permissions */ - mode = ((mode &~ p->p_fd->fd_cmask) & ALLPERMS) & ~S_ISTXT; + mode = ((mode & ~p->p_fd->fd_cmask) & ALLPERMS) & ~S_ISTXT; VATTR_SET(vap, va_mode, mode & ACCESSPERMS); NDINIT(ndp, LOOKUP, OP_OPEN, FOLLOW | AUDITVNPATH1, UIO_SYSSPACE, - CAST_USER_ADDR_T(psfa->psfaa_openargs.psfao_path), - imgp->ip_vfs_context); + CAST_USER_ADDR_T(psfa->psfaa_openargs.psfao_path), + imgp->ip_vfs_context); - error = open1(imgp->ip_vfs_context, - ndp, - psfa->psfaa_openargs.psfao_oflag, - vap, - fileproc_alloc_init, NULL, - ival); + error = open1(imgp->ip_vfs_context, + ndp, + psfa->psfaa_openargs.psfao_oflag, + vap, + fileproc_alloc_init, NULL, + ival); FREE(bufp, M_TEMP); @@ -1810,8 +1863,9 @@ exec_handle_file_actions(struct image_params *imgp, short psa_flags) * reworking all the open code to preallocate fd * slots, and internally taking one as an argument. */ - if (error || ival[0] == psfa->psfaa_filedes) + if (error || ival[0] == psfa->psfaa_filedes) { break; + } origfd = ival[0]; /* @@ -1829,8 +1883,9 @@ exec_handle_file_actions(struct image_params *imgp, short psa_flags) * fd we wanted, the error will stop us. */ error = dup2(p, &dup2a, ival); - if (error) + if (error) { break; + } /* * Finally, close the original fd. @@ -1838,8 +1893,8 @@ exec_handle_file_actions(struct image_params *imgp, short psa_flags) ca.fd = origfd; error = close_nocancel(p, &ca, ival); - } - break; + } + break; case PSFA_DUP2: { struct dup2_args dup2a; @@ -1854,8 +1909,8 @@ exec_handle_file_actions(struct image_params *imgp, short psa_flags) * fd we wanted, the error will stop us. */ error = dup2(p, &dup2a, ival); - } - break; + } + break; case PSFA_CLOSE: { struct close_nocancel_args ca; @@ -1863,8 +1918,8 @@ exec_handle_file_actions(struct image_params *imgp, short psa_flags) ca.fd = psfa->psfaa_filedes; error = close_nocancel(p, &ca, ival); - } - break; + } + break; case PSFA_INHERIT: { struct fcntl_nocancel_args fcntla; @@ -1878,8 +1933,9 @@ exec_handle_file_actions(struct image_params *imgp, short psa_flags) */ fcntla.fd = psfa->psfaa_filedes; fcntla.cmd = F_GETFD; - if ((error = fcntl_nocancel(p, &fcntla, ival)) != 0) + if ((error = fcntl_nocancel(p, &fcntla, ival)) != 0) { break; + } if ((ival[0] & FD_CLOEXEC) == FD_CLOEXEC) { fcntla.fd = psfa->psfaa_filedes; @@ -1887,9 +1943,8 @@ exec_handle_file_actions(struct image_params *imgp, short psa_flags) fcntla.arg = ival[0] & ~FD_CLOEXEC; error = fcntl_nocancel(p, &fcntla, ival); } - - } - break; + } + break; default: error = EINVAL; @@ -1901,7 +1956,7 @@ exec_handle_file_actions(struct image_params *imgp, short psa_flags) if (error) { if (PSFA_OPEN == psfa->psfaa_type) { DTRACE_PROC1(spawn__open__failure, uintptr_t, - psfa->psfaa_openargs.psfao_path); + psfa->psfaa_openargs.psfao_path); } else { DTRACE_PROC1(spawn__fd__failure, int, psfa->psfaa_filedes); } @@ -1909,8 +1964,9 @@ exec_handle_file_actions(struct image_params *imgp, short psa_flags) } } - if (error != 0 || (psa_flags & POSIX_SPAWN_CLOEXEC_DEFAULT) == 0) - return (error); + if (error != 0 || (psa_flags & POSIX_SPAWN_CLOEXEC_DEFAULT) == 0) { + return error; + } /* * If POSIX_SPAWN_CLOEXEC_DEFAULT is set, behave (during @@ -1929,7 +1985,7 @@ exec_handle_file_actions(struct image_params *imgp, short psa_flags) switch (psfa->psfaa_type) { case PSFA_DUP2: fd = psfa->psfaa_openargs.psfao_oflag; - /*FALLTHROUGH*/ + /*FALLTHROUGH*/ case PSFA_OPEN: case PSFA_INHERIT: *fdflags(p, fd) |= UF_INHERIT; @@ -1941,7 +1997,7 @@ exec_handle_file_actions(struct image_params *imgp, short psa_flags) } proc_fdunlock(p); - return (0); + return 0; } #if CONFIG_MACF @@ -1954,20 +2010,23 @@ exec_spawnattr_getmacpolicyinfo(const void *macextensions, const char *policynam const struct _posix_spawn_mac_policy_extensions *psmx = macextensions; int i; - if (psmx == NULL) + if (psmx == NULL) { return NULL; + } for (i = 0; i < psmx->psmx_count; i++) { const _ps_mac_policy_extension_t *extension = &psmx->psmx_extensions[i]; if (strncmp(extension->policyname, policyname, sizeof(extension->policyname)) == 0) { - if (lenp != NULL) + if (lenp != NULL) { *lenp = extension->datalen; + } return extension->datap; } } - if (lenp != NULL) + if (lenp != NULL) { *lenp = 0; + } return NULL; } @@ -1988,10 +2047,12 @@ spawn_copyin_macpolicyinfo(const struct user__posix_spawn_args_desc *px_args, _p } MALLOC(psmx, _posix_spawn_mac_policy_extensions_t, px_args->mac_extensions_size, M_TEMP, M_WAITOK); - if ((error = copyin(px_args->mac_extensions, psmx, px_args->mac_extensions_size)) != 0) + if ((error = copyin(px_args->mac_extensions, psmx, px_args->mac_extensions_size)) != 0) { goto bad; + } - if (PS_MAC_EXTENSIONS_SIZE(psmx->psmx_count) > px_args->mac_extensions_size) { + size_t extsize = PS_MAC_EXTENSIONS_SIZE(psmx->psmx_count); + if (extsize == 0 || extsize > px_args->mac_extensions_size) { error = EINVAL; goto bad; } @@ -2021,8 +2082,9 @@ spawn_copyin_macpolicyinfo(const struct user__posix_spawn_args_desc *px_args, _p bad: if (psmx != NULL) { - for (i = 0; i < copycnt; i++) + for (i = 0; i < copycnt; i++) { FREE(psmx->psmx_extensions[i].datap, M_TEMP); + } FREE(psmx, M_TEMP); } return error; @@ -2033,16 +2095,19 @@ spawn_free_macpolicyinfo(_posix_spawn_mac_policy_extensions_t psmx) { int i; - if (psmx == NULL) + if (psmx == NULL) { return; - for (i = 0; i < psmx->psmx_count; i++) + } + for (i = 0; i < psmx->psmx_count; i++) { FREE(psmx->psmx_extensions[i].datap, M_TEMP); + } FREE(psmx, M_TEMP); } #endif /* CONFIG_MACF */ #if CONFIG_COALITIONS -static inline void spawn_coalitions_release_all(coalition_t coal[COALITION_NUM_TYPES]) +static inline void +spawn_coalitions_release_all(coalition_t coal[COALITION_NUM_TYPES]) { for (int c = 0; c < COALITION_NUM_TYPES; c++) { if (coal[c]) { @@ -2054,7 +2119,8 @@ static inline void spawn_coalitions_release_all(coalition_t coal[COALITION_NUM_T #endif #if CONFIG_PERSONAS -static int spawn_validate_persona(struct _posix_spawn_persona_info *px_persona) +static int +spawn_validate_persona(struct _posix_spawn_persona_info *px_persona) { int error = 0; struct persona *persona = NULL; @@ -2064,8 +2130,9 @@ static int spawn_validate_persona(struct _posix_spawn_persona_info *px_persona) * TODO: rdar://problem/19981151 * Add entitlement check! */ - if (!kauth_cred_issuser(kauth_cred_get())) + if (!kauth_cred_issuser(kauth_cred_get())) { return EPERM; + } persona = persona_lookup(px_persona->pspi_id); if (!persona) { @@ -2087,15 +2154,15 @@ static int spawn_validate_persona(struct _posix_spawn_persona_info *px_persona) } } if (px_persona->pspi_flags & POSIX_SPAWN_PERSONA_GROUPS) { - int ngroups = 0; + unsigned ngroups = 0; gid_t groups[NGROUPS_MAX]; if (persona_get_groups(persona, &ngroups, groups, - px_persona->pspi_ngroups) != 0) { + px_persona->pspi_ngroups) != 0) { error = EINVAL; goto out; } - if (ngroups != (int)px_persona->pspi_ngroups) { + if (ngroups != px_persona->pspi_ngroups) { error = EINVAL; goto out; } @@ -2113,29 +2180,33 @@ static int spawn_validate_persona(struct _posix_spawn_persona_info *px_persona) } out: - if (persona) + if (persona) { persona_put(persona); + } return error; } -static int spawn_persona_adopt(proc_t p, struct _posix_spawn_persona_info *px_persona) +static int +spawn_persona_adopt(proc_t p, struct _posix_spawn_persona_info *px_persona) { int ret; kauth_cred_t cred; struct persona *persona = NULL; int override = !!(px_persona->pspi_flags & POSIX_SPAWN_PERSONA_FLAGS_OVERRIDE); - if (!override) + if (!override) { return persona_proc_adopt_id(p, px_persona->pspi_id, NULL); + } /* * we want to spawn into the given persona, but we want to override * the kauth with a different UID/GID combo */ persona = persona_lookup(px_persona->pspi_id); - if (!persona) + if (!persona) { return ESRCH; + } cred = persona_get_cred(persona); if (!cred) { @@ -2145,24 +2216,24 @@ static int spawn_persona_adopt(proc_t p, struct _posix_spawn_persona_info *px_pe if (px_persona->pspi_flags & POSIX_SPAWN_PERSONA_UID) { cred = kauth_cred_setresuid(cred, - px_persona->pspi_uid, - px_persona->pspi_uid, - px_persona->pspi_uid, - KAUTH_UID_NONE); + px_persona->pspi_uid, + px_persona->pspi_uid, + px_persona->pspi_uid, + KAUTH_UID_NONE); } if (px_persona->pspi_flags & POSIX_SPAWN_PERSONA_GID) { cred = kauth_cred_setresgid(cred, - px_persona->pspi_gid, - px_persona->pspi_gid, - px_persona->pspi_gid); + px_persona->pspi_gid, + px_persona->pspi_gid, + px_persona->pspi_gid); } if (px_persona->pspi_flags & POSIX_SPAWN_PERSONA_GROUPS) { cred = kauth_cred_setgroups(cred, - px_persona->pspi_groups, - px_persona->pspi_ngroups, - px_persona->pspi_gmuid); + px_persona->pspi_groups, + px_persona->pspi_ngroups, + px_persona->pspi_gmuid); } ret = persona_proc_adopt(p, persona, cred); @@ -2173,6 +2244,22 @@ out: } #endif +#if __arm64__ +static inline void +proc_legacy_footprint(proc_t p, task_t task, const char *caller) +{ + boolean_t legacy_footprint_entitled; + + legacy_footprint_entitled = IOTaskHasEntitlement(task, + "com.apple.private.memory.legacy_footprint"); + if (legacy_footprint_entitled) { + printf("%s: %d[%s] legacy footprint (entitled)\n", + caller, p->p_pid, p->p_name); + task_set_legacy_footprint(task, TRUE); + } +} +#endif /* __arm64__ */ + /* * posix_spawn * @@ -2204,14 +2291,14 @@ out: int posix_spawn(proc_t ap, struct posix_spawn_args *uap, int32_t *retval) { - proc_t p = ap; /* quiet bogus GCC vfork() warning */ + proc_t p = ap; /* quiet bogus GCC vfork() warning */ user_addr_t pid = uap->pid; - int ival[2]; /* dummy retval for setpgid() */ - char *bufp = NULL; + int ival[2]; /* dummy retval for setpgid() */ + char *bufp = NULL; struct image_params *imgp; struct vnode_attr *vap; struct vnode_attr *origvap; - struct uthread *uthread = 0; /* compiler complains if not set to 0*/ + struct uthread *uthread = 0; /* compiler complains if not set to 0*/ int error, sig; int is_64 = IS_64BIT_PROCESS(p); struct vfs_context context; @@ -2226,6 +2313,7 @@ posix_spawn(proc_t ap, struct posix_spawn_args *uap, int32_t *retval) int portwatch_count = 0; ipc_port_t * portwatch_ports = NULL; vm_size_t px_sa_offset = offsetof(struct _posix_spawnattr, psa_ports); + task_t old_task = current_task(); task_t new_task = NULL; boolean_t should_release_proc_ref = FALSE; void *inherit = NULL; @@ -2234,7 +2322,7 @@ posix_spawn(proc_t ap, struct posix_spawn_args *uap, int32_t *retval) #endif /* - * Allocate a big chunk for locals instead of using stack since these + * Allocate a big chunk for locals instead of using stack since these * structures are pretty big. */ MALLOC(bufp, char *, (sizeof(*imgp) + sizeof(*vap) + sizeof(*origvap)), M_TEMP, M_WAITOK | M_ZERO); @@ -2253,14 +2341,14 @@ posix_spawn(proc_t ap, struct posix_spawn_args *uap, int32_t *retval) imgp->ip_vattr = vap; imgp->ip_origvattr = origvap; imgp->ip_vfs_context = &context; - imgp->ip_flags = (is_64 ? IMGPF_WAS_64BIT : IMGPF_NONE); + imgp->ip_flags = (is_64 ? IMGPF_WAS_64BIT_ADDR : IMGPF_NONE); imgp->ip_seg = (is_64 ? UIO_USERSPACE64 : UIO_USERSPACE32); imgp->ip_mac_return = 0; imgp->ip_px_persona = NULL; imgp->ip_cs_error = OS_REASON_NULL; if (uap->adesc != USER_ADDR_NULL) { - if(is_64) { + if (is_64) { error = copyin(uap->adesc, &px_args, sizeof(px_args)); } else { struct user32__posix_spawn_args_desc px_args32; @@ -2284,28 +2372,31 @@ posix_spawn(proc_t ap, struct posix_spawn_args *uap, int32_t *retval) px_args.persona_info_size = px_args32.persona_info_size; px_args.persona_info = CAST_USER_ADDR_T(px_args32.persona_info); } - if (error) + if (error) { goto bad; + } if (px_args.attr_size != 0) { - /* - * We are not copying the port_actions pointer, - * because we already have it from px_args. + /* + * We are not copying the port_actions pointer, + * because we already have it from px_args. * This is a bit fragile: */ - if ((error = copyin(px_args.attrp, &px_sa, px_sa_offset) != 0)) - goto bad; - - bzero( (void *)( (unsigned long) &px_sa + px_sa_offset), sizeof(px_sa) - px_sa_offset ); + if ((error = copyin(px_args.attrp, &px_sa, px_sa_offset)) != 0) { + goto bad; + } + + bzero((void *)((unsigned long) &px_sa + px_sa_offset), sizeof(px_sa) - px_sa_offset ); imgp->ip_px_sa = &px_sa; } if (px_args.file_actions_size != 0) { /* Limit file_actions to allowed number of open files */ int maxfa = (p->p_limit ? p->p_rlimit[RLIMIT_NOFILE].rlim_cur : NOFILE); + size_t maxfa_size = PSF_ACTIONS_SIZE(maxfa); if (px_args.file_actions_size < PSF_ACTIONS_SIZE(1) || - px_args.file_actions_size > PSF_ACTIONS_SIZE(maxfa)) { + maxfa_size == 0 || px_args.file_actions_size > maxfa_size) { error = EINVAL; goto bad; } @@ -2316,12 +2407,14 @@ posix_spawn(proc_t ap, struct posix_spawn_args *uap, int32_t *retval) } imgp->ip_px_sfa = px_sfap; - if ((error = copyin(px_args.file_actions, px_sfap, - px_args.file_actions_size)) != 0) + if ((error = copyin(px_args.file_actions, px_sfap, + px_args.file_actions_size)) != 0) { goto bad; + } /* Verify that the action count matches the struct size */ - if (PSF_ACTIONS_SIZE(px_sfap->psfa_act_count) != px_args.file_actions_size) { + size_t psfsize = PSF_ACTIONS_SIZE(px_sfap->psfa_act_count); + if (psfsize == 0 || psfsize != px_args.file_actions_size) { error = EINVAL; goto bad; } @@ -2329,25 +2422,27 @@ posix_spawn(proc_t ap, struct posix_spawn_args *uap, int32_t *retval) if (px_args.port_actions_size != 0) { /* Limit port_actions to one page of data */ if (px_args.port_actions_size < PS_PORT_ACTIONS_SIZE(1) || - px_args.port_actions_size > PAGE_SIZE) { + px_args.port_actions_size > PAGE_SIZE) { error = EINVAL; goto bad; } - MALLOC(px_spap, _posix_spawn_port_actions_t, - px_args.port_actions_size, M_TEMP, M_WAITOK); + MALLOC(px_spap, _posix_spawn_port_actions_t, + px_args.port_actions_size, M_TEMP, M_WAITOK); if (px_spap == NULL) { error = ENOMEM; goto bad; } imgp->ip_px_spa = px_spap; - if ((error = copyin(px_args.port_actions, px_spap, - px_args.port_actions_size)) != 0) + if ((error = copyin(px_args.port_actions, px_spap, + px_args.port_actions_size)) != 0) { goto bad; + } /* Verify that the action count matches the struct size */ - if (PS_PORT_ACTIONS_SIZE(px_spap->pspa_count) != px_args.port_actions_size) { + size_t pasize = PS_PORT_ACTIONS_SIZE(px_spap->pspa_count); + if (pasize == 0 || pasize != px_args.port_actions_size) { error = EINVAL; goto bad; } @@ -2361,7 +2456,7 @@ posix_spawn(proc_t ap, struct posix_spawn_args *uap, int32_t *retval) goto bad; } - MALLOC(px_persona, struct _posix_spawn_persona_info *, px_args.persona_info_size, M_TEMP, M_WAITOK|M_ZERO); + MALLOC(px_persona, struct _posix_spawn_persona_info *, px_args.persona_info_size, M_TEMP, M_WAITOK | M_ZERO); if (px_persona == NULL) { error = ENOMEM; goto bad; @@ -2369,16 +2464,19 @@ posix_spawn(proc_t ap, struct posix_spawn_args *uap, int32_t *retval) imgp->ip_px_persona = px_persona; if ((error = copyin(px_args.persona_info, px_persona, - px_args.persona_info_size)) != 0) + px_args.persona_info_size)) != 0) { goto bad; - if ((error = spawn_validate_persona(px_persona)) != 0) + } + if ((error = spawn_validate_persona(px_persona)) != 0) { goto bad; + } } #endif #if CONFIG_MACF if (px_args.mac_extensions_size != 0) { - if ((error = spawn_copyin_macpolicyinfo(&px_args, (_posix_spawn_mac_policy_extensions_t *)&imgp->ip_px_smpx)) != 0) + if ((error = spawn_copyin_macpolicyinfo(&px_args, (_posix_spawn_mac_policy_extensions_t *)&imgp->ip_px_smpx)) != 0) { goto bad; + } } #endif /* CONFIG_MACF */ } @@ -2392,8 +2490,8 @@ posix_spawn(proc_t ap, struct posix_spawn_args *uap, int32_t *retval) * which depends on it. */ if (uthread->uu_flag & UT_VFORK) { - error = EINVAL; - goto bad; + error = EINVAL; + goto bad; } /* @@ -2403,8 +2501,7 @@ posix_spawn(proc_t ap, struct posix_spawn_args *uap, int32_t *retval) * which is one of the most expensive things about using fork() * and execve(). */ - if (imgp->ip_px_sa == NULL || !(px_sa.psa_flags & POSIX_SPAWN_SETEXEC)){ - + if (imgp->ip_px_sa == NULL || !(px_sa.psa_flags & POSIX_SPAWN_SETEXEC)) { /* Set the new task's coalition, if it is requested. */ coalition_t coal[COALITION_NUM_TYPES] = { COALITION_NULL }; #if CONFIG_COALITIONS @@ -2413,17 +2510,20 @@ posix_spawn(proc_t ap, struct posix_spawn_args *uap, int32_t *retval) struct _posix_spawn_coalition_info coal_info; int coal_role[COALITION_NUM_TYPES]; - if (imgp->ip_px_sa == NULL || !px_args.coal_info) + if (imgp->ip_px_sa == NULL || !px_args.coal_info) { goto do_fork1; + } memset(&coal_info, 0, sizeof(coal_info)); - if (px_args.coal_info_size > sizeof(coal_info)) + if (px_args.coal_info_size > sizeof(coal_info)) { px_args.coal_info_size = sizeof(coal_info); + } error = copyin(px_args.coal_info, - &coal_info, px_args.coal_info_size); - if (error != 0) + &coal_info, px_args.coal_info_size); + if (error != 0) { goto bad; + } ncoals = 0; for (i = 0; i < COALITION_NUM_TYPES; i++) { @@ -2436,8 +2536,8 @@ posix_spawn(proc_t ap, struct posix_spawn_args *uap, int32_t *retval) */ if (!task_is_in_privileged_coalition(p->task, i)) { coal_dbg("ERROR: %d not in privilegd " - "coalition of type %d", - p->p_pid, i); + "coalition of type %d", + p->p_pid, i); spawn_coalitions_release_all(coal); error = EPERM; goto bad; @@ -2452,7 +2552,7 @@ posix_spawn(proc_t ap, struct posix_spawn_args *uap, int32_t *retval) coal[i] = coalition_find_and_activate_by_id(cid); if (coal[i] == COALITION_NULL) { coal_dbg("could not find coalition id:%llu " - "(perhaps it has been terminated or reaped)", cid); + "(perhaps it has been terminated or reaped)", cid); /* * release any other coalition's we * may have a reference to @@ -2463,7 +2563,7 @@ posix_spawn(proc_t ap, struct posix_spawn_args *uap, int32_t *retval) } if (coalition_type(coal[i]) != i) { coal_dbg("coalition with id:%lld is not of type:%d" - " (it's type:%d)", cid, i, coalition_type(coal[i])); + " (it's type:%d)", cid, i, coalition_type(coal[i])); error = ESRCH; goto bad; } @@ -2504,10 +2604,11 @@ do_fork1: /* set the roles of this task within each given coalition */ if (error == 0) { kr = coalitions_set_roles(coal, new_task, coal_role); - if (kr != KERN_SUCCESS) + if (kr != KERN_SUCCESS) { error = EINVAL; + } if (kdebug_debugid_enabled(MACHDBG_CODE(DBG_MACH_COALITION, - MACH_COALITION_ADOPT))) { + MACH_COALITION_ADOPT))) { for (i = 0; i < COALITION_NUM_TYPES; i++) { if (coal[i] != COALITION_NULL) { /* @@ -2515,10 +2616,10 @@ do_fork1: * will get truncated to 32 bits */ KDBG_RELEASE(MACHDBG_CODE( - DBG_MACH_COALITION, - MACH_COALITION_ADOPT), - coalition_id(coal[i]), - get_task_uniqueid(new_task)); + DBG_MACH_COALITION, + MACH_COALITION_ADOPT), + coalition_id(coal[i]), + get_task_uniqueid(new_task)); } } } @@ -2530,8 +2631,8 @@ do_fork1: if (error != 0) { goto bad; } - imgp->ip_flags |= IMGPF_SPAWN; /* spawn w/o exec */ - spawn_no_exec = TRUE; /* used in later tests */ + imgp->ip_flags |= IMGPF_SPAWN; /* spawn w/o exec */ + spawn_no_exec = TRUE; /* used in later tests */ #if CONFIG_PERSONAS /* @@ -2547,7 +2648,7 @@ do_fork1: #if 0 if (!proc_has_persona(p) && imgp->ip_px_persona == NULL) { MALLOC(px_persona, struct _posix_spawn_persona_info *, - sizeof(*px_persona), M_TEMP, M_WAITOK|M_ZERO); + sizeof(*px_persona), M_TEMP, M_WAITOK | M_ZERO); if (px_persona == NULL) { error = ENOMEM; goto bad; @@ -2583,8 +2684,13 @@ do_fork1: * During exec any transition from new_task -> proc is fine, but don't allow * transition from proc->task, since it will modify old_task. */ - imgp->ip_new_thread = fork_create_child(current_task(), - NULL, p, FALSE, p->p_flag & P_LP64, TRUE); + imgp->ip_new_thread = fork_create_child(old_task, + NULL, + p, + FALSE, + p->p_flag & P_LP64, + task_get_64bit_data(old_task), + TRUE); /* task and thread ref returned by fork_create_child */ if (imgp->ip_new_thread == NULL) { error = ENOMEM; @@ -2597,7 +2703,7 @@ do_fork1: if (spawn_no_exec) { p = (proc_t)get_bsdthreadtask_info(imgp->ip_new_thread); - + /* * We had to wait until this point before firing the * proc:::create probe, otherwise p would not point to the @@ -2608,7 +2714,7 @@ do_fork1: assert(p != NULL); context.vc_thread = imgp->ip_new_thread; - context.vc_ucred = p->p_ucred; /* XXX must NOT be kauth_cred_get() */ + context.vc_ucred = p->p_ucred; /* XXX must NOT be kauth_cred_get() */ /* * Post fdcopy(), pre exec_handle_sugid() - this is where we want @@ -2624,8 +2730,9 @@ do_fork1: * is handled in exec_handle_file_actions(). */ if ((error = exec_handle_file_actions(imgp, - imgp->ip_px_sa != NULL ? px_sa.psa_flags : 0)) != 0) + imgp->ip_px_sa != NULL ? px_sa.psa_flags : 0)) != 0) { goto bad; + } } /* Has spawn port actions? */ @@ -2634,8 +2741,9 @@ do_fork1: boolean_t portwatch_present = FALSE; /* Will this process become adaptive? The apptype isn't ready yet, so we can't look there. */ - if (imgp->ip_px_sa != NULL && px_sa.psa_apptype == POSIX_SPAWN_PROC_TYPE_DAEMON_ADAPTIVE) + if (imgp->ip_px_sa != NULL && px_sa.psa_apptype == POSIX_SPAWN_PROC_TYPE_DAEMON_ADAPTIVE) { is_adaptive = TRUE; + } /* * portwatch only: @@ -2649,8 +2757,9 @@ do_fork1: portwatch_ports = NULL; } - if ((error = exec_handle_port_actions(imgp, &portwatch_present, portwatch_ports)) != 0) + if ((error = exec_handle_port_actions(imgp, &portwatch_present, portwatch_ports)) != 0) { goto bad; + } if (portwatch_present == FALSE && portwatch_ports != NULL) { FREE(portwatch_ports, M_TEMP); @@ -2673,8 +2782,9 @@ do_fork1: * Effectively, call setpgid() system call; works * because there are no pointer arguments. */ - if((error = setpgid(p, &spga, ival)) != 0) + if ((error = setpgid(p, &spga, ival)) != 0) { goto bad; + } } /* @@ -2728,8 +2838,9 @@ do_fork1: * being executed. */ error = spawn_persona_adopt(p, imgp->ip_px_persona); - if (error != 0) + if (error != 0) { goto bad; + } } #endif /* CONFIG_PERSONAS */ #if !SECURE_KERNEL @@ -2743,20 +2854,23 @@ do_fork1: * useful or necessary to disable ASLR on a per-process * basis for unit testing and debugging. */ - if (px_sa.psa_flags & _POSIX_SPAWN_DISABLE_ASLR) + if (px_sa.psa_flags & _POSIX_SPAWN_DISABLE_ASLR) { OSBitOrAtomic(P_DISABLE_ASLR, &p->p_flag); + } #endif /* !SECURE_KERNEL */ /* Randomize high bits of ASLR slide */ - if (px_sa.psa_flags & _POSIX_SPAWN_HIGH_BITS_ASLR) + if (px_sa.psa_flags & _POSIX_SPAWN_HIGH_BITS_ASLR) { imgp->ip_flags |= IMGPF_HIGH_BITS_ASLR; + } /* * Forcibly disallow execution from data pages for the spawned process * even if it would otherwise be permitted by the architecture default. */ - if (px_sa.psa_flags & _POSIX_SPAWN_ALLOW_DATA_EXEC) + if (px_sa.psa_flags & _POSIX_SPAWN_ALLOW_DATA_EXEC) { imgp->ip_flags |= IMGPF_ALLOW_DATA_EXEC; + } } /* @@ -2764,10 +2878,11 @@ do_fork1: * _POSIX_SPAWN_DISABLE_ASLR attribute was found above or if * P_DISABLE_ASLR was inherited from the parent process. */ - if (p->p_flag & P_DISABLE_ASLR) + if (p->p_flag & P_DISABLE_ASLR) { imgp->ip_flags |= IMGPF_DISABLE_ASLR; + } - /* + /* * Clear transition flag so we won't hang if exec_activate_image() causes * an automount (and launchd does a proc sysctl to service it). * @@ -2778,11 +2893,12 @@ do_fork1: proc_transit_set = 0; } -#if MAC_SPAWN /* XXX */ +#if MAC_SPAWN /* XXX */ if (uap->mac_p != USER_ADDR_NULL) { error = mac_execve_enter(uap->mac_p, imgp); - if (error) + if (error) { goto bad; + } } #endif @@ -2790,11 +2906,20 @@ do_fork1: * Activate the image */ error = exec_activate_image(imgp); - + if (error == 0 && !spawn_no_exec) { - p = proc_exec_switch_task(p, current_task(), new_task, imgp->ip_new_thread); + p = proc_exec_switch_task(p, old_task, new_task, imgp->ip_new_thread); /* proc ref returned */ should_release_proc_ref = TRUE; + + /* + * Need to transfer pending watch port boosts to the new task while still making + * sure that the old task remains in the importance linkage. Create an importance + * linkage from old task to new task, then switch the task importance base + * of old task and new task. After the switch the port watch boost will be + * boosting the new task and new task will be donating importance to old task. + */ + inherit = ipc_importance_exec_switch_task(old_task, new_task); } if (error == 0) { @@ -2823,8 +2948,9 @@ do_fork1: * they were unmasked in the parent; note that some signals * are not maskable. */ - if (px_sa.psa_flags & POSIX_SPAWN_SETSIGMASK) + if (px_sa.psa_flags & POSIX_SPAWN_SETSIGMASK) { child_uthread->uu_sigmask = (px_sa.psa_sigmask & ~sigcantmask); + } /* * Default a list of signals instead of ignoring them, if * they were ignored in the parent. Note that we pass @@ -2837,9 +2963,10 @@ do_fork1: vec.sa_tramp = 0; vec.sa_mask = 0; vec.sa_flags = 0; - for (sig = 1; sig < NSIG; sig++) - if (px_sa.psa_sigdefault & (1 << (sig-1))) { + for (sig = 1; sig < NSIG; sig++) { + if (px_sa.psa_sigdefault & (1 << (sig - 1))) { error = setsigvec(p, child_thread, sig, &vec, spawn_no_exec); + } } } @@ -2857,10 +2984,10 @@ do_fork1: * whomever is turning it on could just as easily choose not to do so. */ error = proc_set_task_ruse_cpu(p->task, - TASK_POLICY_RESOURCE_ATTRIBUTE_NOTIFY_EXC, - px_sa.psa_cpumonitor_percent, - px_sa.psa_cpumonitor_interval * NSEC_PER_SEC, - 0, TRUE); + TASK_POLICY_RESOURCE_ATTRIBUTE_NOTIFY_EXC, + px_sa.psa_cpumonitor_percent, + px_sa.psa_cpumonitor_interval * NSEC_PER_SEC, + 0, TRUE); } } @@ -2869,29 +2996,31 @@ bad: if (error == 0) { /* reset delay idle sleep status if set */ #if !CONFIG_EMBEDDED - if ((p->p_flag & P_DELAYIDLESLEEP) == P_DELAYIDLESLEEP) + if ((p->p_flag & P_DELAYIDLESLEEP) == P_DELAYIDLESLEEP) { OSBitAndAtomic(~((uint32_t)P_DELAYIDLESLEEP), &p->p_flag); + } #endif /* !CONFIG_EMBEDDED */ /* upon successful spawn, re/set the proc control state */ if (imgp->ip_px_sa != NULL) { switch (px_sa.psa_pcontrol) { - case POSIX_SPAWN_PCONTROL_THROTTLE: - p->p_pcaction = P_PCTHROTTLE; - break; - case POSIX_SPAWN_PCONTROL_SUSPEND: - p->p_pcaction = P_PCSUSP; - break; - case POSIX_SPAWN_PCONTROL_KILL: - p->p_pcaction = P_PCKILL; - break; - case POSIX_SPAWN_PCONTROL_NONE: - default: - p->p_pcaction = 0; - break; - }; + case POSIX_SPAWN_PCONTROL_THROTTLE: + p->p_pcaction = P_PCTHROTTLE; + break; + case POSIX_SPAWN_PCONTROL_SUSPEND: + p->p_pcaction = P_PCSUSP; + break; + case POSIX_SPAWN_PCONTROL_KILL: + p->p_pcaction = P_PCKILL; + break; + case POSIX_SPAWN_PCONTROL_NONE: + default: + p->p_pcaction = 0; + break; + } + ; } exec_resettextvp(p, imgp); - + #if CONFIG_MEMORYSTATUS /* Has jetsam attributes? */ if (imgp->ip_px_sa != NULL && (px_sa.psa_jetsam_flags & POSIX_SPAWN_JETSAM_SET)) { @@ -2905,22 +3034,24 @@ bad: */ if (px_sa.psa_jetsam_flags & POSIX_SPAWN_JETSAM_HIWATER_BACKGROUND) { memorystatus_update(p, px_sa.psa_priority, 0, - (px_sa.psa_jetsam_flags & POSIX_SPAWN_JETSAM_USE_EFFECTIVE_PRIORITY), - TRUE, - -1, TRUE, - px_sa.psa_memlimit_inactive, FALSE); + (px_sa.psa_jetsam_flags & POSIX_SPAWN_JETSAM_USE_EFFECTIVE_PRIORITY), + TRUE, + -1, TRUE, + px_sa.psa_memlimit_inactive, FALSE); } else { memorystatus_update(p, px_sa.psa_priority, 0, - (px_sa.psa_jetsam_flags & POSIX_SPAWN_JETSAM_USE_EFFECTIVE_PRIORITY), - TRUE, - px_sa.psa_memlimit_active, - (px_sa.psa_jetsam_flags & POSIX_SPAWN_JETSAM_MEMLIMIT_ACTIVE_FATAL), - px_sa.psa_memlimit_inactive, - (px_sa.psa_jetsam_flags & POSIX_SPAWN_JETSAM_MEMLIMIT_INACTIVE_FATAL)); + (px_sa.psa_jetsam_flags & POSIX_SPAWN_JETSAM_USE_EFFECTIVE_PRIORITY), + TRUE, + px_sa.psa_memlimit_active, + (px_sa.psa_jetsam_flags & POSIX_SPAWN_JETSAM_MEMLIMIT_ACTIVE_FATAL), + px_sa.psa_memlimit_inactive, + (px_sa.psa_jetsam_flags & POSIX_SPAWN_JETSAM_MEMLIMIT_INACTIVE_FATAL)); } - } #endif /* CONFIG_MEMORYSTATUS */ + if (imgp->ip_px_sa != NULL && px_sa.psa_thread_limit > 0) { + task_set_thread_limit(new_task, (uint16_t)px_sa.psa_thread_limit); + } } /* @@ -2932,8 +3063,9 @@ bad: * before check_for_signature(), which uses psignal. */ if (spawn_no_exec) { - if (proc_transit_set) + if (proc_transit_set) { proc_transend(p, 0); + } /* * Drop the signal lock on the child which was taken on our @@ -2944,12 +3076,14 @@ bad: /* flag the 'fork' has occurred */ proc_knote(p->p_pptr, NOTE_FORK | p->p_pid); - /* then flag exec has occurred */ - /* notify only if it has not failed due to FP Key error */ - if ((p->p_lflag & P_LTERM_DECRYPTFAIL) == 0) - proc_knote(p, NOTE_EXEC); } + /* flag exec has occurred, notify only if it has not failed due to FP Key error */ + if (!error && ((p->p_lflag & P_LTERM_DECRYPTFAIL) == 0)) { + proc_knote(p, NOTE_EXEC); + } + + if (error == 0) { /* * We need to initialize the bank context behind the protection of @@ -2960,14 +3094,18 @@ bad: error = proc_transstart(p, 0, 0); if (error == 0) { - task_bank_init(get_threadtask(imgp->ip_new_thread)); + task_bank_init(new_task); proc_transend(p, 0); } + +#if __arm64__ + proc_legacy_footprint(p, new_task, __FUNCTION__); +#endif /* __arm64__ */ } /* Inherit task role from old task to new task for exec */ if (error == 0 && !spawn_no_exec) { - proc_inherit_task_role(get_threadtask(imgp->ip_new_thread), current_task()); + proc_inherit_task_role(new_task, old_task); } /* @@ -2983,24 +3121,24 @@ bad: struct _posix_spawnattr *psa = (struct _posix_spawnattr *) imgp->ip_px_sa; exec_handle_spawnattr_policy(p, psa->psa_apptype, psa->psa_qos_clamp, psa->psa_darwin_role, - portwatch_ports, portwatch_count); + portwatch_ports, portwatch_count); } /* - * Need to transfer pending watch port boosts to the new task while still making - * sure that the old task remains in the importance linkage. Create an importance - * linkage from old task to new task, then switch the task importance base - * of old task and new task. After the switch the port watch boost will be - * boosting the new task and new task will be donating importance to old task. + * Apply the requested maximum address. */ - if (error == 0 && task_did_exec(current_task())) { - inherit = ipc_importance_exec_switch_task(current_task(), get_threadtask(imgp->ip_new_thread)); + if (error == 0 && imgp->ip_px_sa != NULL) { + struct _posix_spawnattr *psa = (struct _posix_spawnattr *) imgp->ip_px_sa; + + if (psa->psa_max_addr) { + vm_map_set_max_addr(get_task_map(new_task), psa->psa_max_addr); + } } if (error == 0) { - /* Apply the main thread qos */ + /* Apply the main thread qos */ thread_t main_thread = imgp->ip_new_thread; - task_set_main_thread_qos(get_threadtask(imgp->ip_new_thread), main_thread); + task_set_main_thread_qos(new_task, main_thread); #if CONFIG_MACF /* @@ -3008,7 +3146,7 @@ bad: * a jumbo-size map. */ if (mac_proc_check_map_anon(p, 0, 0, 0, MAP_JIT, NULL) == 0) { - vm_map_set_jumbo(get_task_map(p->task)); + vm_map_set_jumbo(get_task_map(new_task)); } #endif /* CONFIG_MACF */ } @@ -3046,34 +3184,44 @@ bad: psignal_vfork(p, p->task, imgp->ip_new_thread, SIGTRAP); } - if (error == 0 && !spawn_no_exec) - KDBG(BSDDBG_CODE(DBG_BSD_PROC,BSD_PROC_EXEC), - p->p_pid); + if (error == 0 && !spawn_no_exec) { + KDBG(BSDDBG_CODE(DBG_BSD_PROC, BSD_PROC_EXEC), + p->p_pid); + } } if (imgp != NULL) { - if (imgp->ip_vp) + if (imgp->ip_vp) { vnode_put(imgp->ip_vp); - if (imgp->ip_scriptvp) + } + if (imgp->ip_scriptvp) { vnode_put(imgp->ip_scriptvp); - if (imgp->ip_strings) + } + if (imgp->ip_strings) { execargs_free(imgp); - if (imgp->ip_px_sfa != NULL) + } + if (imgp->ip_px_sfa != NULL) { FREE(imgp->ip_px_sfa, M_TEMP); - if (imgp->ip_px_spa != NULL) + } + if (imgp->ip_px_spa != NULL) { FREE(imgp->ip_px_spa, M_TEMP); + } #if CONFIG_PERSONAS - if (imgp->ip_px_persona != NULL) + if (imgp->ip_px_persona != NULL) { FREE(imgp->ip_px_persona, M_TEMP); + } #endif #if CONFIG_MACF - if (imgp->ip_px_smpx != NULL) + if (imgp->ip_px_smpx != NULL) { spawn_free_macpolicyinfo(imgp->ip_px_smpx); - if (imgp->ip_execlabelp) + } + if (imgp->ip_execlabelp) { mac_cred_label_free(imgp->ip_execlabelp); - if (imgp->ip_scriptlabelp) + } + if (imgp->ip_scriptlabelp) { mac_vnode_label_free(imgp->ip_scriptlabelp); + } if (imgp->ip_cs_error != OS_REASON_NULL) { os_reason_free(imgp->ip_cs_error); imgp->ip_cs_error = OS_REASON_NULL; @@ -3123,11 +3271,22 @@ bad: (*dtrace_proc_waitfor_hook)(p); } #endif + +#if CONFIG_AUDIT + if (!error && AUDIT_ENABLED() && p) { + /* Add the CDHash of the new process to the audit record */ + uint8_t *cdhash = cs_get_cdhash(p); + if (cdhash) { + AUDIT_ARG(data, cdhash, sizeof(uint8_t), CS_CDHASH_LEN); + } + } +#endif + /* * clear bsd_info from old task if it did exec. */ - if (task_did_exec(current_task())) { - set_bsdtask_info(current_task(), NULL); + if (task_did_exec(old_task)) { + set_bsdtask_info(old_task, NULL); } /* clear bsd_info from new task and terminate it if exec failed */ @@ -3141,8 +3300,9 @@ bad: /* * If the parent wants the pid, copy it out */ - if (pid != USER_ADDR_NULL) + if (pid != USER_ADDR_NULL) { (void)suword(pid, p->p_pid); + } retval[0] = error; /* @@ -3171,9 +3331,9 @@ bad: * switch the tasks, terminating the current task without the switch would * result in loosing the SIGKILL status. */ - if (task_did_exec(current_task())) { + if (task_did_exec(old_task)) { /* Terminate the current task, since exec will start in new task */ - task_terminate_internal(current_task()); + task_terminate_internal(old_task); } /* Release the thread ref returned by fork_create_child/fork1 */ @@ -3201,8 +3361,8 @@ bad: if (inherit != NULL) { ipc_importance_release(inherit); } - - return(error); + + return error; } /* @@ -3367,7 +3527,7 @@ execve(proc_t p, struct execve_args *uap, int32_t *retval) muap.mac_p = USER_ADDR_NULL; err = __mac_execve(p, &muap, retval); - return(err); + return err; } /* @@ -3399,14 +3559,15 @@ execve(proc_t p, struct execve_args *uap, int32_t *retval) int __mac_execve(proc_t p, struct __mac_execve_args *uap, int32_t *retval) { - char *bufp = NULL; + char *bufp = NULL; struct image_params *imgp; struct vnode_attr *vap; struct vnode_attr *origvap; int error; int is_64 = IS_64BIT_PROCESS(p); struct vfs_context context; - struct uthread *uthread; + struct uthread *uthread; + task_t old_task = current_task(); task_t new_task = NULL; boolean_t should_release_proc_ref = FALSE; boolean_t exec_done = FALSE; @@ -3414,9 +3575,9 @@ __mac_execve(proc_t p, struct __mac_execve_args *uap, int32_t *retval) void *inherit = NULL; context.vc_thread = current_thread(); - context.vc_ucred = kauth_cred_proc_ref(p); /* XXX must NOT be kauth_cred_get() */ + context.vc_ucred = kauth_cred_proc_ref(p); /* XXX must NOT be kauth_cred_get() */ - /* Allocate a big chunk for locals instead of using stack since these + /* Allocate a big chunk for locals instead of using stack since these * structures a pretty big. */ MALLOC(bufp, char *, (sizeof(*imgp) + sizeof(*vap) + sizeof(*origvap)), M_TEMP, M_WAITOK | M_ZERO); @@ -3427,7 +3588,7 @@ __mac_execve(proc_t p, struct __mac_execve_args *uap, int32_t *retval) } vap = (struct vnode_attr *) (bufp + sizeof(*imgp)); origvap = (struct vnode_attr *) (bufp + sizeof(*imgp) + sizeof(*vap)); - + /* Initialize the common data in the image_params structure */ imgp->ip_user_fname = uap->fname; imgp->ip_user_argv = uap->argp; @@ -3435,7 +3596,7 @@ __mac_execve(proc_t p, struct __mac_execve_args *uap, int32_t *retval) imgp->ip_vattr = vap; imgp->ip_origvattr = origvap; imgp->ip_vfs_context = &context; - imgp->ip_flags = (is_64 ? IMGPF_WAS_64BIT : IMGPF_NONE) | ((p->p_flag & P_DISABLE_ASLR) ? IMGPF_DISABLE_ASLR : IMGPF_NONE); + imgp->ip_flags = (is_64 ? IMGPF_WAS_64BIT_ADDR : IMGPF_NONE) | ((p->p_flag & P_DISABLE_ASLR) ? IMGPF_DISABLE_ASLR : IMGPF_NONE); imgp->ip_seg = (is_64 ? UIO_USERSPACE64 : UIO_USERSPACE32); imgp->ip_mac_return = 0; imgp->ip_cs_error = OS_REASON_NULL; @@ -3481,8 +3642,13 @@ __mac_execve(proc_t p, struct __mac_execve_args *uap, int32_t *retval) * During exec any transition from new_task -> proc is fine, but don't allow * transition from proc->task, since it will modify old_task. */ - imgp->ip_new_thread = fork_create_child(current_task(), - NULL, p, FALSE, p->p_flag & P_LP64, TRUE); + imgp->ip_new_thread = fork_create_child(old_task, + NULL, + p, + FALSE, + p->p_flag & P_LP64, + task_get_64bit_data(old_task), + TRUE); /* task and thread ref returned by fork_create_child */ if (imgp->ip_new_thread == NULL) { error = ENOMEM; @@ -3505,16 +3671,26 @@ __mac_execve(proc_t p, struct __mac_execve_args *uap, int32_t *retval) } if (!error && !in_vfexec) { - p = proc_exec_switch_task(p, current_task(), new_task, imgp->ip_new_thread); + p = proc_exec_switch_task(p, old_task, new_task, imgp->ip_new_thread); /* proc ref returned */ should_release_proc_ref = TRUE; + + /* + * Need to transfer pending watch port boosts to the new task while still making + * sure that the old task remains in the importance linkage. Create an importance + * linkage from old task to new task, then switch the task importance base + * of old task and new task. After the switch the port watch boost will be + * boosting the new task and new task will be donating importance to old task. + */ + inherit = ipc_importance_exec_switch_task(old_task, new_task); } kauth_cred_unref(&context.vc_ucred); - + /* Image not claimed by any activator? */ - if (error == -1) + if (error == -1) { error = ENOEXEC; + } if (!error) { exec_done = TRUE; @@ -3522,18 +3698,29 @@ __mac_execve(proc_t p, struct __mac_execve_args *uap, int32_t *retval) exec_resettextvp(p, imgp); error = check_for_signature(p, imgp); - } - if (imgp->ip_vp != NULLVP) + } + + /* flag exec has occurred, notify only if it has not failed due to FP Key error */ + if (exec_done && ((p->p_lflag & P_LTERM_DECRYPTFAIL) == 0)) { + proc_knote(p, NOTE_EXEC); + } + + if (imgp->ip_vp != NULLVP) { vnode_put(imgp->ip_vp); - if (imgp->ip_scriptvp != NULLVP) + } + if (imgp->ip_scriptvp != NULLVP) { vnode_put(imgp->ip_scriptvp); - if (imgp->ip_strings) + } + if (imgp->ip_strings) { execargs_free(imgp); + } #if CONFIG_MACF - if (imgp->ip_execlabelp) + if (imgp->ip_execlabelp) { mac_cred_label_free(imgp->ip_execlabelp); - if (imgp->ip_scriptlabelp) + } + if (imgp->ip_scriptlabelp) { mac_vnode_label_free(imgp->ip_scriptlabelp); + } #endif if (imgp->ip_cs_error != OS_REASON_NULL) { os_reason_free(imgp->ip_cs_error); @@ -3551,15 +3738,19 @@ __mac_execve(proc_t p, struct __mac_execve_args *uap, int32_t *retval) } if (!error) { - task_bank_init(get_threadtask(imgp->ip_new_thread)); + task_bank_init(new_task); proc_transend(p, 0); +#if __arm64__ + proc_legacy_footprint(p, new_task, __FUNCTION__); +#endif /* __arm64__ */ + /* Sever any extant thread affinity */ thread_affinity_exec(current_thread()); /* Inherit task role from old task to new task for exec */ if (!in_vfexec) { - proc_inherit_task_role(get_threadtask(imgp->ip_new_thread), current_task()); + proc_inherit_task_role(new_task, old_task); } thread_t main_thread = imgp->ip_new_thread; @@ -3576,12 +3767,31 @@ __mac_execve(proc_t p, struct __mac_execve_args *uap, int32_t *retval) } #endif /* CONFIG_MACF */ + if (vm_darkwake_mode == TRUE) { + /* + * This process is being launched when the system + * is in darkwake. So mark it specially. This will + * cause all its pages to be entered in the background Q. + */ + task_set_darkwake_mode(new_task, vm_darkwake_mode); + } #if CONFIG_DTRACE dtrace_thread_didexec(imgp->ip_new_thread); - if ((dtrace_proc_waitfor_hook = dtrace_proc_waitfor_exec_ptr) != NULL) + if ((dtrace_proc_waitfor_hook = dtrace_proc_waitfor_exec_ptr) != NULL) { (*dtrace_proc_waitfor_hook)(p); + } +#endif + +#if CONFIG_AUDIT + if (!error && AUDIT_ENABLED() && p) { + /* Add the CDHash of the new process to the audit record */ + uint8_t *cdhash = cs_get_cdhash(p); + if (cdhash) { + AUDIT_ARG(data, cdhash, sizeof(uint8_t), CS_CDHASH_LEN); + } + } #endif if (in_vfexec) { @@ -3596,8 +3806,8 @@ exit_with_error: /* * clear bsd_info from old task if it did exec. */ - if (task_did_exec(current_task())) { - set_bsdtask_info(current_task(), NULL); + if (task_did_exec(old_task)) { + set_bsdtask_info(old_task, NULL); } /* clear bsd_info from new task and terminate it if exec failed */ @@ -3606,26 +3816,15 @@ exit_with_error: task_terminate_internal(new_task); } - /* - * Need to transfer pending watch port boosts to the new task while still making - * sure that the old task remains in the importance linkage. Create an importance - * linkage from old task to new task, then switch the task importance base - * of old task and new task. After the switch the port watch boost will be - * boosting the new task and new task will be donating importance to old task. - */ - if (error == 0 && task_did_exec(current_task())) { - inherit = ipc_importance_exec_switch_task(current_task(), get_threadtask(imgp->ip_new_thread)); - } - if (imgp != NULL) { /* * Do not terminate the current task, if proc_exec_switch_task did not * switch the tasks, terminating the current task without the switch would * result in loosing the SIGKILL status. */ - if (task_did_exec(current_task())) { + if (task_did_exec(old_task)) { /* Terminate the current task, since exec will start in new task */ - task_terminate_internal(current_task()); + task_terminate_internal(old_task); } /* Release the thread ref returned by fork_create_child */ @@ -3654,8 +3853,8 @@ exit_with_error: if (inherit != NULL) { ipc_importance_release(inherit); } - - return(error); + + return error; } @@ -3685,11 +3884,11 @@ copyinptr(user_addr_t froma, user_addr_t *toptr, int ptr_size) unsigned int i; error = copyin(froma, &i, 4); - *toptr = CAST_USER_ADDR_T(i); /* SAFE */ + *toptr = CAST_USER_ADDR_T(i); /* SAFE */ } else { error = copyin(froma, toptr, 8); } - return (error); + return error; } @@ -3714,13 +3913,13 @@ copyoutptr(user_addr_t ua, user_addr_t ptr, int ptr_size) if (ptr_size == 4) { /* 64 bit value containing 32 bit address */ - unsigned int i = CAST_DOWN_EXPLICIT(unsigned int,ua); /* SAFE */ + unsigned int i = CAST_DOWN_EXPLICIT(unsigned int, ua); /* SAFE */ error = copyout(&i, ptr, 4); } else { error = copyout(&ua, ptr, 8); } - return (error); + return error; } @@ -3802,25 +4001,25 @@ static int exec_copyout_strings(struct image_params *imgp, user_addr_t *stackp) { proc_t p = vfs_context_proc(imgp->ip_vfs_context); - int ptr_size = (imgp->ip_flags & IMGPF_IS_64BIT) ? 8 : 4; - int ptr_area_size; + int ptr_size = (imgp->ip_flags & IMGPF_IS_64BIT_ADDR) ? 8 : 4; + int ptr_area_size; void *ptr_buffer_start, *ptr_buffer; int string_size; - user_addr_t string_area; /* *argv[], *env[] */ - user_addr_t ptr_area; /* argv[], env[], applev[] */ - user_addr_t argc_area; /* argc */ - user_addr_t stack; + user_addr_t string_area; /* *argv[], *env[] */ + user_addr_t ptr_area; /* argv[], env[], applev[] */ + user_addr_t argc_area; /* argc */ + user_addr_t stack; int error; unsigned i; struct copyout_desc { - char *start_string; - int count; + char *start_string; + int count; #if CONFIG_DTRACE - user_addr_t *dtrace_cookie; + user_addr_t *dtrace_cookie; #endif - boolean_t null_term; + boolean_t null_term; } descriptors[] = { { .start_string = imgp->ip_startargv, @@ -3876,8 +4075,7 @@ exec_copyout_strings(struct image_params *imgp, user_addr_t *stackp) * Need room for one pointer for each string, plus * one for the NULLs terminating the argv, envv, and apple areas. */ - ptr_area_size = (imgp->ip_argc + imgp->ip_envc + imgp->ip_applec + 3) * - ptr_size; + ptr_area_size = (imgp->ip_argc + imgp->ip_envc + imgp->ip_applec + 3) * ptr_size; stack -= ptr_area_size; ptr_area = stack; @@ -3909,11 +4107,12 @@ exec_copyout_strings(struct image_params *imgp, user_addr_t *stackp) * Copy out the entire strings area. */ error = copyout(imgp->ip_strings, string_area, - string_size); - if (error) + string_size); + if (error) { goto bad; + } - for (i = 0; i < sizeof(descriptors)/sizeof(descriptors[0]); i++) { + for (i = 0; i < sizeof(descriptors) / sizeof(descriptors[0]); i++) { char *cur_string = descriptors[i].start_string; int j; @@ -3931,14 +4130,14 @@ exec_copyout_strings(struct image_params *imgp, user_addr_t *stackp) */ for (j = 0; j < descriptors[i].count; j++) { user_addr_t cur_address = string_area + (cur_string - imgp->ip_strings); - + /* Copy out the pointer to the current string. Alignment has been verified */ if (ptr_size == 8) { *(uint64_t *)ptr_buffer = (uint64_t)cur_address; } else { *(uint32_t *)ptr_buffer = (uint32_t)cur_address; } - + ptr_buffer = (void *)((uintptr_t)ptr_buffer + ptr_size); cur_string += strlen(cur_string) + 1; /* Only a NUL between strings in the same area */ } @@ -3949,7 +4148,7 @@ exec_copyout_strings(struct image_params *imgp, user_addr_t *stackp) } else { *(uint32_t *)ptr_buffer = 0; } - + ptr_buffer = (void *)((uintptr_t)ptr_buffer + ptr_size); } } @@ -3958,17 +4157,19 @@ exec_copyout_strings(struct image_params *imgp, user_addr_t *stackp) * Copy out all our pointer arrays in bulk. */ error = copyout(ptr_buffer_start, ptr_area, - ptr_area_size); - if (error) + ptr_area_size); + if (error) { goto bad; + } /* argc (int32, stored in a ptr_size area) */ error = copyoutptr((user_addr_t)imgp->ip_argc, argc_area, ptr_size); - if (error) + if (error) { goto bad; + } bad: - return(error); + return error; } @@ -4003,14 +4204,14 @@ static int exec_extract_strings(struct image_params *imgp) { int error = 0; - int ptr_size = (imgp->ip_flags & IMGPF_WAS_64BIT) ? 8 : 4; - int new_ptr_size = (imgp->ip_flags & IMGPF_IS_64BIT) ? 8 : 4; - user_addr_t argv = imgp->ip_user_argv; - user_addr_t envv = imgp->ip_user_envv; + int ptr_size = (imgp->ip_flags & IMGPF_WAS_64BIT_ADDR) ? 8 : 4; + int new_ptr_size = (imgp->ip_flags & IMGPF_IS_64BIT_ADDR) ? 8 : 4; + user_addr_t argv = imgp->ip_user_argv; + user_addr_t envv = imgp->ip_user_envv; /* * Adjust space reserved for the path name by however much padding it - * needs. Doing this here since we didn't know if this would be a 32- + * needs. Doing this here since we didn't know if this would be a 32- * or 64-bit process back in exec_save_path. */ while (imgp->ip_strspace % new_ptr_size != 0) { @@ -4025,8 +4226,8 @@ exec_extract_strings(struct image_params *imgp) imgp->ip_startargv = imgp->ip_strendp; imgp->ip_argc = 0; - if((imgp->ip_flags & IMGPF_INTERPRET) != 0) { - user_addr_t arg; + if ((imgp->ip_flags & IMGPF_INTERPRET) != 0) { + user_addr_t arg; char *argstart, *ch; /* First, the arguments in the "#!" string are tokenized and extracted. */ @@ -4057,8 +4258,9 @@ exec_extract_strings(struct image_params *imgp) } /* Error-check, regardless of whether this is the last interpreter arg or not */ - if (error) + if (error) { goto bad; + } if (imgp->ip_argspace < new_ptr_size) { error = E2BIG; goto bad; @@ -4075,8 +4277,9 @@ exec_extract_strings(struct image_params *imgp) * to locate their script arguments. */ error = copyinptr(argv, &arg, ptr_size); - if (error) + if (error) { goto bad; + } if (arg != 0LL) { argv += ptr_size; /* consume without using */ } @@ -4089,9 +4292,10 @@ exec_extract_strings(struct image_params *imgp) } else { error = exec_add_user_string(imgp, imgp->ip_user_fname, imgp->ip_seg, TRUE); } - - if (error) + + if (error) { goto bad; + } if (imgp->ip_argspace < new_ptr_size) { error = E2BIG; goto bad; @@ -4101,11 +4305,12 @@ exec_extract_strings(struct image_params *imgp) } while (argv != 0LL) { - user_addr_t arg; + user_addr_t arg; error = copyinptr(argv, &arg, ptr_size); - if (error) + if (error) { goto bad; + } if (arg == 0LL) { break; @@ -4114,18 +4319,19 @@ exec_extract_strings(struct image_params *imgp) argv += ptr_size; /* - * av[n...] = arg[n] - */ + * av[n...] = arg[n] + */ error = exec_add_user_string(imgp, arg, imgp->ip_seg, TRUE); - if (error) + if (error) { goto bad; + } if (imgp->ip_argspace < new_ptr_size) { error = E2BIG; goto bad; } imgp->ip_argspace -= new_ptr_size; /* to hold argv[] entry */ imgp->ip_argc++; - } + } /* Save space for argv[] NULL terminator */ if (imgp->ip_argspace < new_ptr_size) { @@ -4133,29 +4339,31 @@ exec_extract_strings(struct image_params *imgp) goto bad; } imgp->ip_argspace -= new_ptr_size; - + /* Note where the args ends and env begins. */ imgp->ip_endargv = imgp->ip_strendp; imgp->ip_envc = 0; /* Now, get the environment */ while (envv != 0LL) { - user_addr_t env; + user_addr_t env; error = copyinptr(envv, &env, ptr_size); - if (error) + if (error) { goto bad; + } envv += ptr_size; if (env == 0LL) { break; } /* - * av[n...] = env[n] - */ + * av[n...] = env[n] + */ error = exec_add_user_string(imgp, env, imgp->ip_seg, TRUE); - if (error) + if (error) { goto bad; + } if (imgp->ip_argspace < new_ptr_size) { error = E2BIG; goto bad; @@ -4181,7 +4389,7 @@ exec_extract_strings(struct image_params *imgp) imgp->ip_strspace--; imgp->ip_argspace--; } - + /* Note where the envv ends and applev begins. */ imgp->ip_endenvv = imgp->ip_strendp; @@ -4200,15 +4408,21 @@ bad: * 8-byte guard. Until somebody needs more than an 8-byte guard value, don't * do the work to construct them. */ -#define GUARD_VALUES 1 -#define GUARD_KEY "stack_guard=" +#define GUARD_VALUES 1 +#define GUARD_KEY "stack_guard=" /* * System malloc needs some entropy when it is initialized. */ -#define ENTROPY_VALUES 2 +#define ENTROPY_VALUES 2 #define ENTROPY_KEY "malloc_entropy=" +/* + * libplatform needs a random pointer-obfuscation value when it is initialized. + */ +#define PTR_MUNGE_VALUES 1 +#define PTR_MUNGE_KEY "ptr_munge=" + /* * System malloc engages nanozone for UIAPP. */ @@ -4231,9 +4445,9 @@ extern user64_addr_t commpage_text64_location; static int exec_add_entropy_key(struct image_params *imgp, - const char *key, - int values, - boolean_t embedNUL) + const char *key, + int values, + boolean_t embedNUL) { const int limit = 8; uint64_t entropy[limit]; @@ -4242,7 +4456,7 @@ exec_add_entropy_key(struct image_params *imgp, values = limit; } - read_random(entropy, sizeof(entropy[0]) * values); + read_random(entropy, sizeof(entropy[0]) * values); if (embedNUL) { entropy[0] &= ~(0xffull << 8); @@ -4264,10 +4478,10 @@ exec_add_entropy_key(struct image_params *imgp, */ static int exec_add_apple_strings(struct image_params *imgp, - const load_result_t *load_result) + const load_result_t *load_result) { int error; - int img_ptr_size = (imgp->ip_flags & IMGPF_IS_64BIT) ? 8 : 4; + int img_ptr_size = (imgp->ip_flags & IMGPF_IS_64BIT_ADDR) ? 8 : 4; /* exec_save_path stored the first string */ imgp->ip_applec = 1; @@ -4295,7 +4509,7 @@ exec_add_apple_strings(struct image_params *imgp, if ((proc_flags & _POSIX_SPAWN_NANO_ALLOCATOR) == _POSIX_SPAWN_NANO_ALLOCATOR) { const char *nano_string = NANO_ENGAGE_KEY; error = exec_add_user_string(imgp, CAST_USER_ADDR_T(nano_string), UIO_SYSSPACE, FALSE); - if (error){ + if (error) { goto bad; } imgp->ip_applec++; @@ -4324,7 +4538,17 @@ exec_add_apple_strings(struct image_params *imgp, } imgp->ip_applec++; - /* + /* + * Supply libpthread & libplatform with a random value to use for pointer + * obfuscation. + */ + error = exec_add_entropy_key(imgp, PTR_MUNGE_KEY, PTR_MUNGE_VALUES, FALSE); + if (error) { + goto bad; + } + imgp->ip_applec++; + + /* * Add MAIN_STACK_KEY: Supplies the address and size of the main thread's * stack if it was allocated by the kernel. * @@ -4334,11 +4558,11 @@ exec_add_apple_strings(struct image_params *imgp, if (load_result->unixproc) { char stack_string[strlen(MAIN_STACK_KEY) + (HEX_STR_LEN + 1) * MAIN_STACK_VALUES + 1]; snprintf(stack_string, sizeof(stack_string), - MAIN_STACK_KEY "0x%llx,0x%llx,0x%llx,0x%llx", - (uint64_t)load_result->user_stack, - (uint64_t)load_result->user_stack_size, - (uint64_t)load_result->user_stack_alloc, - (uint64_t)load_result->user_stack_alloc_size); + MAIN_STACK_KEY "0x%llx,0x%llx,0x%llx,0x%llx", + (uint64_t)load_result->user_stack, + (uint64_t)load_result->user_stack_size, + (uint64_t)load_result->user_stack_alloc, + (uint64_t)load_result->user_stack_alloc_size); error = exec_add_user_string(imgp, CAST_USER_ADDR_T(stack_string), UIO_SYSSPACE, FALSE); if (error) { goto bad; @@ -4347,12 +4571,12 @@ exec_add_apple_strings(struct image_params *imgp, } if (imgp->ip_vattr) { - uint64_t fsid = get_va_fsid(imgp->ip_vattr); + uint64_t fsid = vnode_get_va_fsid(imgp->ip_vattr); uint64_t fsobjid = imgp->ip_vattr->va_fileid; char fsid_string[strlen(FSID_KEY) + strlen(FSID_MAX_STRING) + 1]; snprintf(fsid_string, sizeof(fsid_string), - FSID_KEY "0x%llx,0x%llx", fsid, fsobjid); + FSID_KEY "0x%llx,0x%llx", fsid, fsobjid); error = exec_add_user_string(imgp, CAST_USER_ADDR_T(fsid_string), UIO_SYSSPACE, FALSE); if (error) { goto bad; @@ -4360,26 +4584,26 @@ exec_add_apple_strings(struct image_params *imgp, imgp->ip_applec++; } - if (imgp->ip_dyld_fsid || imgp->ip_dyld_fsobjid ) { + if (imgp->ip_dyld_fsid || imgp->ip_dyld_fsobjid) { char fsid_string[strlen(DYLD_FSID_KEY) + strlen(FSID_MAX_STRING) + 1]; snprintf(fsid_string, sizeof(fsid_string), - DYLD_FSID_KEY "0x%llx,0x%llx", imgp->ip_dyld_fsid, imgp->ip_dyld_fsobjid); + DYLD_FSID_KEY "0x%llx,0x%llx", imgp->ip_dyld_fsid, imgp->ip_dyld_fsobjid); error = exec_add_user_string(imgp, CAST_USER_ADDR_T(fsid_string), UIO_SYSSPACE, FALSE); if (error) { goto bad; } imgp->ip_applec++; } - - uint8_t cdhash[SHA1_RESULTLEN]; + + uint8_t cdhash[SHA1_RESULTLEN]; int cdhash_errror = ubc_cs_getcdhash(imgp->ip_vp, imgp->ip_arch_offset, cdhash); if (cdhash_errror == 0) { - char hash_string[strlen(CDHASH_KEY) + 2*SHA1_RESULTLEN + 1]; + char hash_string[strlen(CDHASH_KEY) + 2 * SHA1_RESULTLEN + 1]; strncpy(hash_string, CDHASH_KEY, sizeof(hash_string)); - char *p = hash_string + sizeof(CDHASH_KEY) - 1; - for (int i = 0; i < SHA1_RESULTLEN; i++) { + char *p = hash_string + sizeof(CDHASH_KEY) - 1; + for (int i = 0; i < SHA1_RESULTLEN; i++) { snprintf(p, 3, "%02x", (int) cdhash[i]); - p += 2; + p += 2; } error = exec_add_user_string(imgp, CAST_USER_ADDR_T(hash_string), UIO_SYSSPACE, FALSE); if (error) { @@ -4398,7 +4622,7 @@ bad: return error; } -#define unix_stack_size(p) (p->p_rlimit[RLIMIT_STACK].rlim_cur) +#define unix_stack_size(p) (p->p_rlimit[RLIMIT_STACK].rlim_cur) /* * exec_check_permissions @@ -4426,9 +4650,10 @@ exec_check_permissions(struct image_params *imgp) kauth_action_t action; /* Only allow execution of regular files */ - if (!vnode_isreg(vp)) - return (EACCES); - + if (!vnode_isreg(vp)) { + return EACCES; + } + /* Get the file attributes that we will be using here and elsewhere */ VATTR_INIT(vap); VATTR_WANTED(vap, va_uid); @@ -4438,48 +4663,56 @@ exec_check_permissions(struct image_params *imgp) VATTR_WANTED(vap, va_fsid64); VATTR_WANTED(vap, va_fileid); VATTR_WANTED(vap, va_data_size); - if ((error = vnode_getattr(vp, vap, imgp->ip_vfs_context)) != 0) - return (error); + if ((error = vnode_getattr(vp, vap, imgp->ip_vfs_context)) != 0) { + return error; + } /* * Ensure that at least one execute bit is on - otherwise root * will always succeed, and we don't want to happen unless the * file really is executable. */ - if (!vfs_authopaque(vnode_mount(vp)) && ((vap->va_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) == 0)) - return (EACCES); + if (!vfs_authopaque(vnode_mount(vp)) && ((vap->va_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) == 0)) { + return EACCES; + } /* Disallow zero length files */ - if (vap->va_data_size == 0) - return (ENOEXEC); + if (vap->va_data_size == 0) { + return ENOEXEC; + } imgp->ip_arch_offset = (user_size_t)0; imgp->ip_arch_size = vap->va_data_size; /* Disable setuid-ness for traced programs or if MNT_NOSUID */ - if ((vp->v_mount->mnt_flag & MNT_NOSUID) || (p->p_lflag & P_LTRACED)) + if ((vp->v_mount->mnt_flag & MNT_NOSUID) || (p->p_lflag & P_LTRACED)) { vap->va_mode &= ~(VSUID | VSGID); + } /* * Disable _POSIX_SPAWN_ALLOW_DATA_EXEC and _POSIX_SPAWN_DISABLE_ASLR * flags for setuid/setgid binaries. */ - if (vap->va_mode & (VSUID | VSGID)) + if (vap->va_mode & (VSUID | VSGID)) { imgp->ip_flags &= ~(IMGPF_ALLOW_DATA_EXEC | IMGPF_DISABLE_ASLR); + } #if CONFIG_MACF error = mac_vnode_check_exec(imgp->ip_vfs_context, vp, imgp); - if (error) - return (error); + if (error) { + return error; + } #endif - /* Check for execute permission */ - action = KAUTH_VNODE_EXECUTE; - /* Traced images must also be readable */ - if (p->p_lflag & P_LTRACED) - action |= KAUTH_VNODE_READ_DATA; - if ((error = vnode_authorize(vp, NULL, action, imgp->ip_vfs_context)) != 0) - return (error); + /* Check for execute permission */ + action = KAUTH_VNODE_EXECUTE; + /* Traced images must also be readable */ + if (p->p_lflag & P_LTRACED) { + action |= KAUTH_VNODE_READ_DATA; + } + if ((error = vnode_authorize(vp, NULL, action, imgp->ip_vfs_context)) != 0) { + return error; + } #if 0 /* Don't let it run if anyone had it open for writing */ @@ -4487,7 +4720,7 @@ exec_check_permissions(struct image_params *imgp) if (vp->v_writecount) { panic("going to return ETXTBSY %x", vp); vnode_unlock(vp); - return (ETXTBSY); + return ETXTBSY; } vnode_unlock(vp); #endif @@ -4495,7 +4728,7 @@ exec_check_permissions(struct image_params *imgp) /* XXX May want to indicate to underlying FS that vnode is open */ - return (error); + return error; } @@ -4528,17 +4761,17 @@ exec_check_permissions(struct image_params *imgp) static int exec_handle_sugid(struct image_params *imgp) { - proc_t p = vfs_context_proc(imgp->ip_vfs_context); - kauth_cred_t cred = vfs_context_ucred(imgp->ip_vfs_context); - kauth_cred_t my_cred, my_new_cred; - int i; - int leave_sugid_clear = 0; - int mac_reset_ipc = 0; - int error = 0; - task_t task = NULL; + proc_t p = vfs_context_proc(imgp->ip_vfs_context); + kauth_cred_t cred = vfs_context_ucred(imgp->ip_vfs_context); + kauth_cred_t my_cred, my_new_cred; + int i; + int leave_sugid_clear = 0; + int mac_reset_ipc = 0; + int error = 0; + task_t task = NULL; #if CONFIG_MACF - int mac_transition, disjoint_cred = 0; - int label_update_return = 0; + int mac_transition, disjoint_cred = 0; + int label_update_return = 0; /* * Determine whether a call to update the MAC label will result in the @@ -4550,14 +4783,14 @@ exec_handle_sugid(struct image_params *imgp) * slow down the exec fast path for normal binaries. */ mac_transition = mac_cred_check_label_update_execve( - imgp->ip_vfs_context, - imgp->ip_vp, - imgp->ip_arch_offset, - imgp->ip_scriptvp, - imgp->ip_scriptlabelp, - imgp->ip_execlabelp, - p, - imgp->ip_px_smpx); + imgp->ip_vfs_context, + imgp->ip_vp, + imgp->ip_arch_offset, + imgp->ip_scriptvp, + imgp->ip_scriptlabelp, + imgp->ip_execlabelp, + p, + imgp->ip_px_smpx); #endif OSBitAndAtomic(~((uint32_t)P_SUGID), &p->p_flag); @@ -4577,11 +4810,10 @@ exec_handle_sugid(struct image_params *imgp) * such a call. */ if (((imgp->ip_origvattr->va_mode & VSUID) != 0 && - kauth_cred_getuid(cred) != imgp->ip_origvattr->va_uid) || + kauth_cred_getuid(cred) != imgp->ip_origvattr->va_uid) || ((imgp->ip_origvattr->va_mode & VSGID) != 0 && - ((kauth_cred_ismember_gid(cred, imgp->ip_origvattr->va_gid, &leave_sugid_clear) || !leave_sugid_clear) || - (kauth_cred_getgid(cred) != imgp->ip_origvattr->va_gid)))) { - + ((kauth_cred_ismember_gid(cred, imgp->ip_origvattr->va_gid, &leave_sugid_clear) || !leave_sugid_clear) || + (kauth_cred_getgid(cred) != imgp->ip_origvattr->va_gid)))) { #if CONFIG_MACF /* label for MAC transition and neither VSUID nor VSGID */ handle_mac_transition: @@ -4668,13 +4900,13 @@ handle_mac_transition: #endif /* !SECURE_KERNEL */ #if CONFIG_MACF - /* + /* * If a policy has indicated that it will transition the label, * before making the call into the MAC policies, get a new * duplicate credential, so they can modify it without * modifying any others sharing it. */ - if (mac_transition) { + if (mac_transition) { /* * This hook may generate upcalls that require * importance donation from the kernel. @@ -4683,16 +4915,16 @@ handle_mac_transition: thread_t thread = current_thread(); thread_enable_send_importance(thread, TRUE); kauth_proc_label_update_execve(p, - imgp->ip_vfs_context, - imgp->ip_vp, - imgp->ip_arch_offset, - imgp->ip_scriptvp, - imgp->ip_scriptlabelp, - imgp->ip_execlabelp, - &imgp->ip_csflags, - imgp->ip_px_smpx, - &disjoint_cred, /* will be non zero if disjoint */ - &label_update_return); + imgp->ip_vfs_context, + imgp->ip_vp, + imgp->ip_arch_offset, + imgp->ip_scriptvp, + imgp->ip_scriptlabelp, + imgp->ip_execlabelp, + &imgp->ip_csflags, + imgp->ip_px_smpx, + &disjoint_cred, /* will be non zero if disjoint */ + &label_update_return); thread_enable_send_importance(thread, FALSE); if (disjoint_cred) { @@ -4707,13 +4939,13 @@ handle_mac_transition: */ leave_sugid_clear = 0; } - + imgp->ip_mac_return = label_update_return; } - + mac_reset_ipc = mac_proc_check_inherit_ipc_ports(p, p->p_textvp, p->p_textoff, imgp->ip_vp, imgp->ip_arch_offset, imgp->ip_scriptvp); -#endif /* CONFIG_MACF */ +#endif /* CONFIG_MACF */ /* * If 'leave_sugid_clear' is non-zero, then we passed the @@ -4721,7 +4953,7 @@ handle_mac_transition: * the previous cred was a member of the VSGID group, but * that it was not the default at the time of the execve, * and that the post-labelling credential was not disjoint. - * So we don't set the P_SUGID or reset mach ports and fds + * So we don't set the P_SUGID or reset mach ports and fds * on the basis of simply running this code. */ if (mac_reset_ipc || !leave_sugid_clear) { @@ -4732,9 +4964,9 @@ handle_mac_transition: * task/thread after. */ ipc_task_reset((imgp->ip_new_thread != NULL) ? - get_threadtask(imgp->ip_new_thread) : p->task); + get_threadtask(imgp->ip_new_thread) : p->task); ipc_thread_reset((imgp->ip_new_thread != NULL) ? - imgp->ip_new_thread : current_thread()); + imgp->ip_new_thread : current_thread()); } if (!leave_sugid_clear) { @@ -4752,17 +4984,17 @@ handle_mac_transition: * to libc. */ for (i = 0; i < 3; i++) { - - if (p->p_fd->fd_ofiles[i] != NULL) + if (p->p_fd->fd_ofiles[i] != NULL) { continue; + } /* * Do the kernel equivalent of * - * if i == 0 - * (void) open("/dev/null", O_RDONLY); - * else - * (void) open("/dev/null", O_WRONLY); + * if i == 0 + * (void) open("/dev/null", O_RDONLY); + * else + * (void) open("/dev/null", O_WRONLY); */ struct fileproc *fp; @@ -4770,14 +5002,16 @@ handle_mac_transition: int flag; struct nameidata *ndp = NULL; - if (i == 0) + if (i == 0) { flag = FREAD; - else + } else { flag = FWRITE; + } if ((error = falloc(p, - &fp, &indx, imgp->ip_vfs_context)) != 0) + &fp, &indx, imgp->ip_vfs_context)) != 0) { continue; + } MALLOC(ndp, struct nameidata *, sizeof(*ndp), M_TEMP, M_WAITOK | M_ZERO); if (ndp == NULL) { @@ -4828,7 +5062,7 @@ handle_mac_transition: } } -#endif /* CONFIG_MACF */ +#endif /* CONFIG_MACF */ /* * Implement the semantic where the effective user and group become @@ -4840,7 +5074,7 @@ handle_mac_transition: */ for (;;) { my_cred = kauth_cred_proc_ref(p); - my_new_cred = kauth_cred_setsvuidgid(my_cred, kauth_cred_getuid(my_cred), kauth_cred_getgid(my_cred)); + my_new_cred = kauth_cred_setsvuidgid(my_cred, kauth_cred_getuid(my_cred), kauth_cred_getgid(my_cred)); if (my_new_cred == my_cred) { kauth_cred_unref(&my_cred); @@ -4869,7 +5103,7 @@ handle_mac_transition: /* Update the process' identity version and set the security token */ - p->p_idversion++; + p->p_idversion = OSIncrementAtomic(&nextpidversion); if (imgp->ip_new_thread != NULL) { task = get_threadtask(imgp->ip_new_thread); @@ -4878,7 +5112,7 @@ handle_mac_transition: } set_security_token_task_internal(p, task); - return(error); + return error; } @@ -4900,17 +5134,20 @@ handle_mac_transition: * !KERN_SUCCESS Mach failure code */ static kern_return_t -create_unix_stack(vm_map_t map, load_result_t* load_result, - proc_t p) +create_unix_stack(vm_map_t map, load_result_t* load_result, + proc_t p) { - mach_vm_size_t size, prot_size; - mach_vm_offset_t addr, prot_addr; - kern_return_t kr; + mach_vm_size_t size, prot_size; + mach_vm_offset_t addr, prot_addr; + kern_return_t kr; + + mach_vm_address_t user_stack = load_result->user_stack; - mach_vm_address_t user_stack = load_result->user_stack; - proc_lock(p); p->user_stack = user_stack; + if (load_result->custom_stack) { + p->p_lflag |= P_LCUSTOM_STACK; + } proc_unlock(p); if (load_result->user_stack_alloc_size > 0) { @@ -4926,12 +5163,12 @@ create_unix_stack(vm_map_t map, load_result_t* load_result, } addr = mach_vm_trunc_page(load_result->user_stack - size); kr = mach_vm_allocate_kernel(map, &addr, size, - VM_FLAGS_FIXED, VM_MEMORY_STACK); + VM_FLAGS_FIXED, VM_MEMORY_STACK); if (kr != KERN_SUCCESS) { // Can't allocate at default location, try anywhere addr = 0; kr = mach_vm_allocate_kernel(map, &addr, size, - VM_FLAGS_ANYWHERE, VM_MEMORY_STACK); + VM_FLAGS_ANYWHERE, VM_MEMORY_STACK); if (kr != KERN_SUCCESS) { return kr; } @@ -4951,7 +5188,9 @@ create_unix_stack(vm_map_t map, load_result_t* load_result, * size limit for this process. */ if (load_result->user_stack_size == 0) { + proc_list_lock(); load_result->user_stack_size = unix_stack_size(p); + proc_list_unlock(); prot_size = mach_vm_trunc_page(size - load_result->user_stack_size); } else { prot_size = PAGE_SIZE; @@ -4959,10 +5198,10 @@ create_unix_stack(vm_map_t map, load_result_t* load_result, prot_addr = addr; kr = mach_vm_protect(map, - prot_addr, - prot_size, - FALSE, - VM_PROT_NONE); + prot_addr, + prot_size, + FALSE, + VM_PROT_NONE); if (kr != KERN_SUCCESS) { (void)mach_vm_deallocate(map, addr, size); return kr; @@ -4985,7 +5224,7 @@ create_unix_stack(vm_map_t map, load_result_t* load_result, * path NULL terminated path * * Returns: KERN_SUCCESS Success - * !KERN_SUCCESS See execve/mac_execve for error codes + * !KERN_SUCCESS See execve/mac_execve for error codes * * Notes: The process that is passed in is the first manufactured * process on the system, and gets here via bsd_ast() firing @@ -5017,8 +5256,9 @@ load_init_program_at_path(proc_t p, user_addr_t scratch_addr, const char* path) size_t path_length = strlen(path) + 1; argv0 = scratch_addr; error = copyout(path, argv0, path_length); - if (error) + if (error) { return error; + } scratch_addr = USER_ADDR_ALIGN(scratch_addr + path_length, sizeof(user_addr_t)); @@ -5028,36 +5268,39 @@ load_init_program_at_path(proc_t p, user_addr_t scratch_addr, const char* path) */ if (boothowto & RB_SINGLE) { const char *init_args = "-s"; - size_t init_args_length = strlen(init_args)+1; + size_t init_args_length = strlen(init_args) + 1; argv1 = scratch_addr; error = copyout(init_args, argv1, init_args_length); - if (error) + if (error) { return error; + } scratch_addr = USER_ADDR_ALIGN(scratch_addr + init_args_length, sizeof(user_addr_t)); } if (proc_is64bit(p)) { - user64_addr_t argv64bit[3]; + user64_addr_t argv64bit[3] = {}; argv64bit[0] = argv0; argv64bit[1] = argv1; argv64bit[2] = USER_ADDR_NULL; error = copyout(argv64bit, scratch_addr, sizeof(argv64bit)); - if (error) + if (error) { return error; + } } else { - user32_addr_t argv32bit[3]; + user32_addr_t argv32bit[3] = {}; argv32bit[0] = (user32_addr_t)argv0; argv32bit[1] = (user32_addr_t)argv1; argv32bit[2] = USER_ADDR_NULL; error = copyout(argv32bit, scratch_addr, sizeof(argv32bit)); - if (error) + if (error) { return error; + } } /* @@ -5134,13 +5377,14 @@ load_init_program(proc_t p) if (PE_parse_boot_argn("launchdsuffix", launchd_suffix, sizeof(launchd_suffix))) { char launchd_path[128]; boolean_t is_release_suffix = ((launchd_suffix[0] == 0) || - (strcmp(launchd_suffix, "release") == 0)); + (strcmp(launchd_suffix, "release") == 0)); if (is_release_suffix) { printf("load_init_program: attempting to load /sbin/launchd\n"); error = load_init_program_at_path(p, (user_addr_t)scratch_addr, "/sbin/launchd"); - if (!error) + if (!error) { return; + } panic("Process 1 exec of launchd.release failed, errno %d", error); } else { @@ -5159,7 +5403,7 @@ load_init_program(proc_t p) #endif error = ENOENT; - for (i = 0; i < sizeof(init_programs)/sizeof(init_programs[0]); i++) { + for (i = 0; i < sizeof(init_programs) / sizeof(init_programs[0]); i++) { printf("load_init_program: attempting to load %s\n", init_programs[i]); error = load_init_program_at_path(p, (user_addr_t)scratch_addr, init_programs[i]); if (!error) { @@ -5169,7 +5413,7 @@ load_init_program(proc_t p) } } - panic("Process 1 exec of %s failed, errno %d", ((i == 0) ? "" : init_programs[i-1]), error); + panic("Process 1 exec of %s failed, errno %d", ((i == 0) ? "" : init_programs[i - 1]), error); } /* @@ -5191,13 +5435,14 @@ load_init_program(proc_t p) * EIO An I/O error occurred * EBADEXEC The executable is corrupt/unknown */ -static int +static int load_return_to_errno(load_return_t lrtn) { switch (lrtn) { case LOAD_SUCCESS: return 0; case LOAD_BADARCH: + case LOAD_BADARCH_X86: return EBADARCH; case LOAD_BADMACHO: case LOAD_BADMACHO_UPX: @@ -5265,29 +5510,34 @@ static int execargs_waiters = 0; lck_mtx_t *execargs_cache_lock; static void -execargs_lock_lock(void) { +execargs_lock_lock(void) +{ lck_mtx_lock_spin(execargs_cache_lock); } static void -execargs_lock_unlock(void) { +execargs_lock_unlock(void) +{ lck_mtx_unlock(execargs_cache_lock); } static wait_result_t -execargs_lock_sleep(void) { - return(lck_mtx_sleep(execargs_cache_lock, LCK_SLEEP_DEFAULT, &execargs_free_count, THREAD_INTERRUPTIBLE)); +execargs_lock_sleep(void) +{ + return lck_mtx_sleep(execargs_cache_lock, LCK_SLEEP_DEFAULT, &execargs_free_count, THREAD_INTERRUPTIBLE); } static kern_return_t -execargs_purgeable_allocate(char **execarg_address) { +execargs_purgeable_allocate(char **execarg_address) +{ kern_return_t kr = vm_allocate_kernel(bsd_pageable_map, (vm_offset_t *)execarg_address, BSD_PAGEABLE_SIZE_PER_EXEC, VM_FLAGS_ANYWHERE | VM_FLAGS_PURGABLE, VM_KERN_MEMORY_NONE); assert(kr == KERN_SUCCESS); return kr; } static kern_return_t -execargs_purgeable_reference(void *execarg_address) { +execargs_purgeable_reference(void *execarg_address) +{ int state = VM_PURGABLE_NONVOLATILE; kern_return_t kr = vm_purgable_control(bsd_pageable_map, (vm_offset_t) execarg_address, VM_PURGABLE_SET_STATE, &state); @@ -5296,7 +5546,8 @@ execargs_purgeable_reference(void *execarg_address) { } static kern_return_t -execargs_purgeable_volatilize(void *execarg_address) { +execargs_purgeable_volatilize(void *execarg_address) +{ int state = VM_PURGABLE_VOLATILE | VM_PURGABLE_ORDERING_OBSOLETE; kern_return_t kr; kr = vm_purgable_control(bsd_pageable_map, (vm_offset_t) execarg_address, VM_PURGABLE_SET_STATE, &state); @@ -5307,7 +5558,8 @@ execargs_purgeable_volatilize(void *execarg_address) { } static void -execargs_wakeup_waiters(void) { +execargs_wakeup_waiters(void) +{ thread_wakeup(&execargs_free_count); } @@ -5326,7 +5578,7 @@ execargs_alloc(struct image_params *imgp) execargs_waiters--; if (res != THREAD_AWAKENED) { execargs_lock_unlock(); - return (EINTR); + return EINTR; } } @@ -5345,25 +5597,25 @@ execargs_alloc(struct image_params *imgp) assert(execargs_free_count >= 0); execargs_lock_unlock(); - + if (cache_index == -1) { kret = execargs_purgeable_allocate(&imgp->ip_strings); - } - else + } else { kret = execargs_purgeable_reference(imgp->ip_strings); + } assert(kret == KERN_SUCCESS); if (kret != KERN_SUCCESS) { - return (ENOMEM); + return ENOMEM; } /* last page used to read in file headers */ - imgp->ip_vdata = imgp->ip_strings + ( NCARGS + PAGE_SIZE ); + imgp->ip_vdata = imgp->ip_strings + (NCARGS + PAGE_SIZE); imgp->ip_strendp = imgp->ip_strings; imgp->ip_argspace = NCARGS; - imgp->ip_strspace = ( NCARGS + PAGE_SIZE ); + imgp->ip_strspace = (NCARGS + PAGE_SIZE); - return (0); + return 0; } /* @@ -5385,7 +5637,7 @@ execargs_free(struct image_params *imgp) kern_return_t kret; int i; boolean_t needs_wakeup = FALSE; - + kret = execargs_purgeable_volatilize(imgp->ip_strings); execargs_lock_lock(); @@ -5402,15 +5654,17 @@ execargs_free(struct image_params *imgp) assert(imgp->ip_strings == NULL); - if (execargs_waiters > 0) + if (execargs_waiters > 0) { needs_wakeup = TRUE; - + } + execargs_lock_unlock(); - if (needs_wakeup == TRUE) + if (needs_wakeup == TRUE) { execargs_wakeup_waiters(); + } - return ((kret == KERN_SUCCESS ? 0 : EINVAL)); + return kret == KERN_SUCCESS ? 0 : EINVAL; } static void @@ -5424,8 +5678,9 @@ exec_resettextvp(proc_t p, struct image_params *imgp) vp = imgp->ip_vp; offset = imgp->ip_arch_offset; - if (vp == NULLVP) + if (vp == NULLVP) { panic("exec_resettextvp: expected valid vp"); + } ret = vnode_ref(vp); proc_lock(p); @@ -5433,107 +5688,47 @@ exec_resettextvp(proc_t p, struct image_params *imgp) p->p_textvp = vp; p->p_textoff = offset; } else { - p->p_textvp = NULLVP; /* this is paranoia */ + p->p_textvp = NULLVP; /* this is paranoia */ p->p_textoff = 0; } proc_unlock(p); - if ( tvp != NULLVP) { + if (tvp != NULLVP) { if (vnode_getwithref(tvp) == 0) { vnode_rele(tvp); vnode_put(tvp); } - } - + } } // Includes the 0-byte (therefore "SIZE" instead of "LEN"). static const size_t CS_CDHASH_STRING_SIZE = CS_CDHASH_LEN * 2 + 1; -static void cdhash_to_string(char str[CS_CDHASH_STRING_SIZE], uint8_t const * const cdhash) { - static char const nibble[] = "0123456789abcdef"; - - /* Apparently still the safest way to get a hex representation - * of binary data. - * xnu's printf routines have %*D/%20D in theory, but "not really", see: - * confusion around %*D/%nD in printf - */ - for (int i = 0; i < CS_CDHASH_LEN; ++i) { - str[i*2] = nibble[(cdhash[i] & 0xf0) >> 4]; - str[i*2+1] = nibble[cdhash[i] & 0x0f]; - } - str[CS_CDHASH_STRING_SIZE - 1] = 0; -} - -/* - * If the process is not signed or if it contains entitlements, we - * need to communicate through the task_access_port to taskgated. - * - * taskgated will provide a detached code signature if present, and - * will enforce any restrictions on entitlements. - */ - -static boolean_t -taskgated_required(proc_t p, boolean_t *require_success) +static void +cdhash_to_string(char str[CS_CDHASH_STRING_SIZE], uint8_t const * const cdhash) { - size_t length; - void *blob; - int error; - - if (cs_debug > 2) - csvnode_print_debug(p->p_textvp); - -#if !CONFIG_EMBEDDED - const int can_skip_taskgated = csproc_get_platform_binary(p) && !csproc_get_platform_path(p); -#else - const int can_skip_taskgated = csproc_get_platform_binary(p); -#endif - if (can_skip_taskgated) { - if (cs_debug) printf("taskgated not required for: %s\n", p->p_name); - *require_success = FALSE; - return FALSE; - } + static char const nibble[] = "0123456789abcdef"; - if ((p->p_csflags & CS_VALID) == 0) { - *require_success = FALSE; - return TRUE; - } - - error = cs_entitlements_blob_get(p, &blob, &length); - if (error == 0 && blob != NULL) { -#if !CONFIG_EMBEDDED - /* - * fatal on the desktop when entitlements are present, - * unless we started in single-user mode - */ - if ((boothowto & RB_SINGLE) == 0) - *require_success = TRUE; - /* - * Allow initproc to run without causing taskgated to launch - */ - if (p == initproc) { - *require_success = FALSE; - return FALSE; - } - -#endif - if (cs_debug) printf("taskgated required for: %s\n", p->p_name); - - return TRUE; + /* Apparently still the safest way to get a hex representation + * of binary data. + * xnu's printf routines have %*D/%20D in theory, but "not really", see: + * confusion around %*D/%nD in printf + */ + for (int i = 0; i < CS_CDHASH_LEN; ++i) { + str[i * 2] = nibble[(cdhash[i] & 0xf0) >> 4]; + str[i * 2 + 1] = nibble[cdhash[i] & 0x0f]; } - - *require_success = FALSE; - return FALSE; + str[CS_CDHASH_STRING_SIZE - 1] = 0; } /* * __EXEC_WAITING_ON_TASKGATED_CODE_SIGNATURE_UPCALL__ - * + * * Description: Waits for the userspace daemon to respond to the request - * we made. Function declared non inline to be visible in + * we made. Function declared non inline to be visible in * stackshots and spindumps as well as debugging. */ -__attribute__((noinline)) int +__attribute__((noinline)) int __EXEC_WAITING_ON_TASKGATED_CODE_SIGNATURE_UPCALL__(mach_port_t task_access_port, int32_t new_pid) { return find_code_signature(task_access_port, new_pid); @@ -5546,7 +5741,7 @@ check_for_signature(proc_t p, struct image_params *imgp) kern_return_t kr = KERN_FAILURE; int error = EACCES; boolean_t unexpected_failure = FALSE; - unsigned char hash[CS_CDHASH_LEN]; + struct cs_blob *csb; boolean_t require_success = FALSE; int spawn = (imgp->ip_flags & IMGPF_SPAWN); int vfexec = (imgp->ip_flags & IMGPF_VFORK_EXEC); @@ -5562,7 +5757,7 @@ check_for_signature(proc_t p, struct image_params *imgp) proc_unlock(p); /* Set the switch_protect flag on the map */ - if(p->p_csflags & (CS_HARD|CS_KILL)) { + if (p->p_csflags & (CS_HARD | CS_KILL)) { vm_map_switch_protect(get_task_map(p->task), TRUE); } @@ -5572,9 +5767,8 @@ check_for_signature(proc_t p, struct image_params *imgp) * approve of exec, kill and return immediately. */ if (imgp->ip_mac_return != 0) { - KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_PROC, BSD_PROC_EXITREASON_CREATE) | DBG_FUNC_NONE, - p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_SECURITY_POLICY, 0, 0); + p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_SECURITY_POLICY, 0, 0); signature_failure_reason = os_reason_create(OS_REASON_EXEC, EXEC_EXIT_REASON_SECURITY_POLICY); error = imgp->ip_mac_return; unexpected_failure = TRUE; @@ -5588,18 +5782,23 @@ check_for_signature(proc_t p, struct image_params *imgp) goto done; } - /* check if callout to taskgated is needed */ - if (!taskgated_required(p, &require_success)) { + /* If the code signature came through the image activation path, we skip the + * taskgated / externally attached path. */ + if (imgp->ip_csflags & CS_SIGNED) { error = 0; goto done; } + /* The rest of the code is for signatures that either already have been externally + * attached (likely, but not necessarily by a previous run through the taskgated + * path), or that will now be attached by taskgated. */ + kr = task_get_task_access_port(p->task, &port); if (KERN_SUCCESS != kr || !IPC_PORT_VALID(port)) { error = 0; if (require_success) { KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_PROC, BSD_PROC_EXITREASON_CREATE) | DBG_FUNC_NONE, - p->p_pid, OS_REASON_CODESIGNING, CODESIGNING_EXIT_REASON_TASK_ACCESS_PORT, 0, 0); + p->p_pid, OS_REASON_CODESIGNING, CODESIGNING_EXIT_REASON_TASK_ACCESS_PORT, 0, 0); signature_failure_reason = os_reason_create(OS_REASON_CODESIGNING, CODESIGNING_EXIT_REASON_TASK_ACCESS_PORT); error = EACCES; } @@ -5608,9 +5807,9 @@ check_for_signature(proc_t p, struct image_params *imgp) /* * taskgated returns KERN_SUCCESS if it has completed its work - * and the exec should continue, KERN_FAILURE if the exec should - * fail, or it may error out with different error code in an - * event of mig failure (e.g. process was signalled during the + * and the exec should continue, KERN_FAILURE if the exec should + * fail, or it may error out with different error code in an + * event of mig failure (e.g. process was signalled during the * rpc call, taskgated died, mig server died etc.). */ @@ -5623,14 +5822,14 @@ check_for_signature(proc_t p, struct image_params *imgp) error = EACCES; KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_PROC, BSD_PROC_EXITREASON_CREATE) | DBG_FUNC_NONE, - p->p_pid, OS_REASON_CODESIGNING, CODESIGNING_EXIT_REASON_TASKGATED_INVALID_SIG, 0, 0); + p->p_pid, OS_REASON_CODESIGNING, CODESIGNING_EXIT_REASON_TASKGATED_INVALID_SIG, 0, 0); signature_failure_reason = os_reason_create(OS_REASON_CODESIGNING, CODESIGNING_EXIT_REASON_TASKGATED_INVALID_SIG); goto done; default: error = EACCES; KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_PROC, BSD_PROC_EXITREASON_CREATE) | DBG_FUNC_NONE, - p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_TASKGATED_OTHER, 0, 0); + p->p_pid, OS_REASON_EXEC, EXEC_EXIT_REASON_TASKGATED_OTHER, 0, 0); signature_failure_reason = os_reason_create(OS_REASON_EXEC, EXEC_EXIT_REASON_TASKGATED_OTHER); unexpected_failure = TRUE; goto done; @@ -5638,14 +5837,39 @@ check_for_signature(proc_t p, struct image_params *imgp) /* Only do this if exec_resettextvp() did not fail */ if (p->p_textvp != NULLVP) { - /* - * If there's a new code directory, mark this process - * as signed. - */ - if (0 == ubc_cs_getcdhash(p->p_textvp, p->p_textoff, hash)) { - proc_lock(p); - p->p_csflags |= CS_VALID; - proc_unlock(p); + csb = ubc_cs_blob_get(p->p_textvp, -1, p->p_textoff); + + if (csb != NULL) { + /* As the enforcement we can do here is very limited, we only allow things that + * are the only reason why this code path still exists: + * Adhoc signed non-platform binaries without special cs_flags and without any + * entitlements (unrestricted ones still pass AMFI). */ + if ( + /* Revalidate the blob if necessary through bumped generation count. */ + (ubc_cs_generation_check(p->p_textvp) == 0 || + ubc_cs_blob_revalidate(p->p_textvp, csb, imgp, 0) == 0) && + /* Only CS_ADHOC, no CS_KILL, CS_HARD etc. */ + (csb->csb_flags & CS_ALLOWED_MACHO) == CS_ADHOC && + /* If it has a CMS blob, it's not adhoc. The CS_ADHOC flag can lie. */ + csblob_find_blob_bytes((const uint8_t *)csb->csb_mem_kaddr, csb->csb_mem_size, + CSSLOT_SIGNATURESLOT, + CSMAGIC_BLOBWRAPPER) == NULL && + /* It could still be in a trust cache (unlikely with CS_ADHOC), or a magic path. */ + csb->csb_platform_binary == 0 && + /* No entitlements, not even unrestricted ones. */ + csb->csb_entitlements_blob == NULL) { + proc_lock(p); + p->p_csflags |= CS_SIGNED | CS_VALID; + proc_unlock(p); + } else { + uint8_t cdhash[CS_CDHASH_LEN]; + char cdhash_string[CS_CDHASH_STRING_SIZE]; + proc_getcdhash(p, cdhash); + cdhash_to_string(cdhash_string, cdhash); + printf("ignoring detached code signature on '%s' with cdhash '%s' " + "because it is invalid, or not a simple adhoc signature.\n", + p->p_name, cdhash_string); + } } } @@ -5661,16 +5885,17 @@ done: cdhash_to_string(cdhash_string, cdhash); os_log(peLog, "CS Platform Exec Logging: Executing platform signed binary " - "'%s' with cdhash %s\n", p->p_name, cdhash_string); + "'%s' with cdhash %s\n", p->p_name, cdhash_string); } } else { - if (!unexpected_failure) + if (!unexpected_failure) { p->p_csflags |= CS_KILLED; + } /* make very sure execution fails */ if (vfexec || spawn) { assert(signature_failure_reason != OS_REASON_NULL); psignal_vfork_with_reason(p, p->task, imgp->ip_new_thread, - SIGKILL, signature_failure_reason); + SIGKILL, signature_failure_reason); signature_failure_reason = OS_REASON_NULL; error = 0; } else { @@ -5695,7 +5920,8 @@ done: * in the process' page tables, we prefault some pages if * possible. Errors are non-fatal. */ -static void exec_prefault_data(proc_t p __unused, struct image_params *imgp, load_result_t *load_result) +static void +exec_prefault_data(proc_t p __unused, struct image_params *imgp, load_result_t *load_result) { int ret; size_t expected_all_image_infos_size; @@ -5704,13 +5930,13 @@ static void exec_prefault_data(proc_t p __unused, struct image_params *imgp, loa * Prefault executable or dyld entry point. */ vm_fault(current_map(), - vm_map_trunc_page(load_result->entry_point, - vm_map_page_mask(current_map())), - VM_PROT_READ | VM_PROT_EXECUTE, - FALSE, VM_KERN_MEMORY_NONE, - THREAD_UNINT, NULL, 0); - - if (imgp->ip_flags & IMGPF_IS_64BIT) { + vm_map_trunc_page(load_result->entry_point, + vm_map_page_mask(current_map())), + VM_PROT_READ | VM_PROT_EXECUTE, + FALSE, VM_KERN_MEMORY_NONE, + THREAD_UNINT, NULL, 0); + + if (imgp->ip_flags & IMGPF_IS_64BIT_ADDR) { expected_all_image_infos_size = sizeof(struct user64_dyld_all_image_infos); } else { expected_all_image_infos_size = sizeof(struct user32_dyld_all_image_infos); @@ -5718,11 +5944,11 @@ static void exec_prefault_data(proc_t p __unused, struct image_params *imgp, loa /* Decode dyld anchor structure from */ if (load_result->dynlinker && - load_result->all_image_info_addr && - load_result->all_image_info_size >= expected_all_image_infos_size) { + load_result->all_image_info_addr && + load_result->all_image_info_size >= expected_all_image_infos_size) { union { - struct user64_dyld_all_image_infos infos64; - struct user32_dyld_all_image_infos infos32; + struct user64_dyld_all_image_infos infos64; + struct user32_dyld_all_image_infos infos32; } all_image_infos; /* @@ -5730,33 +5956,32 @@ static void exec_prefault_data(proc_t p __unused, struct image_params *imgp, loa * and recovery path. */ vm_fault(current_map(), - vm_map_trunc_page(load_result->all_image_info_addr, - vm_map_page_mask(current_map())), - VM_PROT_READ | VM_PROT_WRITE, - FALSE, VM_KERN_MEMORY_NONE, - THREAD_UNINT, NULL, 0); + vm_map_trunc_page(load_result->all_image_info_addr, + vm_map_page_mask(current_map())), + VM_PROT_READ | VM_PROT_WRITE, + FALSE, VM_KERN_MEMORY_NONE, + THREAD_UNINT, NULL, 0); if ((load_result->all_image_info_addr & PAGE_MASK) + expected_all_image_infos_size > PAGE_SIZE) { /* all_image_infos straddles a page */ vm_fault(current_map(), - vm_map_trunc_page(load_result->all_image_info_addr + expected_all_image_infos_size - 1, - vm_map_page_mask(current_map())), - VM_PROT_READ | VM_PROT_WRITE, - FALSE, VM_KERN_MEMORY_NONE, - THREAD_UNINT, NULL, 0); + vm_map_trunc_page(load_result->all_image_info_addr + expected_all_image_infos_size - 1, + vm_map_page_mask(current_map())), + VM_PROT_READ | VM_PROT_WRITE, + FALSE, VM_KERN_MEMORY_NONE, + THREAD_UNINT, NULL, 0); } ret = copyin(load_result->all_image_info_addr, - &all_image_infos, - expected_all_image_infos_size); + &all_image_infos, + expected_all_image_infos_size); if (ret == 0 && all_image_infos.infos32.version >= DYLD_ALL_IMAGE_INFOS_ADDRESS_MINIMUM_VERSION) { - user_addr_t notification_address; user_addr_t dyld_image_address; user_addr_t dyld_version_address; user_addr_t dyld_all_image_infos_address; user_addr_t dyld_slide_amount; - if (imgp->ip_flags & IMGPF_IS_64BIT) { + if (imgp->ip_flags & IMGPF_IS_64BIT_ADDR) { notification_address = all_image_infos.infos64.notification; dyld_image_address = all_image_infos.infos64.dyldImageLoadAddress; dyld_version_address = all_image_infos.infos64.dyldVersion; @@ -5785,38 +6010,38 @@ static void exec_prefault_data(proc_t p __unused, struct image_params *imgp, loa #if 0 kprintf("exec_prefault: 0x%016llx 0x%08x 0x%016llx 0x%016llx 0x%016llx 0x%016llx\n", - (uint64_t)load_result->all_image_info_addr, - all_image_infos.infos32.version, - (uint64_t)notification_address, - (uint64_t)dyld_image_address, - (uint64_t)dyld_version_address, - (uint64_t)dyld_all_image_infos_address); + (uint64_t)load_result->all_image_info_addr, + all_image_infos.infos32.version, + (uint64_t)notification_address, + (uint64_t)dyld_image_address, + (uint64_t)dyld_version_address, + (uint64_t)dyld_all_image_infos_address); #endif vm_fault(current_map(), - vm_map_trunc_page(notification_address + dyld_slide_amount, - vm_map_page_mask(current_map())), - VM_PROT_READ | VM_PROT_EXECUTE, - FALSE, VM_KERN_MEMORY_NONE, - THREAD_UNINT, NULL, 0); + vm_map_trunc_page(notification_address + dyld_slide_amount, + vm_map_page_mask(current_map())), + VM_PROT_READ | VM_PROT_EXECUTE, + FALSE, VM_KERN_MEMORY_NONE, + THREAD_UNINT, NULL, 0); vm_fault(current_map(), - vm_map_trunc_page(dyld_image_address + dyld_slide_amount, - vm_map_page_mask(current_map())), - VM_PROT_READ | VM_PROT_EXECUTE, - FALSE, VM_KERN_MEMORY_NONE, - THREAD_UNINT, NULL, 0); + vm_map_trunc_page(dyld_image_address + dyld_slide_amount, + vm_map_page_mask(current_map())), + VM_PROT_READ | VM_PROT_EXECUTE, + FALSE, VM_KERN_MEMORY_NONE, + THREAD_UNINT, NULL, 0); vm_fault(current_map(), - vm_map_trunc_page(dyld_version_address + dyld_slide_amount, - vm_map_page_mask(current_map())), - VM_PROT_READ, - FALSE, VM_KERN_MEMORY_NONE, - THREAD_UNINT, NULL, 0); + vm_map_trunc_page(dyld_version_address + dyld_slide_amount, + vm_map_page_mask(current_map())), + VM_PROT_READ, + FALSE, VM_KERN_MEMORY_NONE, + THREAD_UNINT, NULL, 0); vm_fault(current_map(), - vm_map_trunc_page(dyld_all_image_infos_address + dyld_slide_amount, - vm_map_page_mask(current_map())), - VM_PROT_READ | VM_PROT_WRITE, - FALSE, VM_KERN_MEMORY_NONE, - THREAD_UNINT, NULL, 0); + vm_map_trunc_page(dyld_all_image_infos_address + dyld_slide_amount, + vm_map_page_mask(current_map())), + VM_PROT_READ | VM_PROT_WRITE, + FALSE, VM_KERN_MEMORY_NONE, + THREAD_UNINT, NULL, 0); } } }