X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/3e170ce000f1506b7b5d2c5c7faec85ceabb573d..e8c3f78193f1895ea514044358b93b1add9322f3:/osfmk/kern/ipc_tt.c?ds=sidebyside diff --git a/osfmk/kern/ipc_tt.c b/osfmk/kern/ipc_tt.c index 9a43453bd..6fcef9f17 100644 --- a/osfmk/kern/ipc_tt.c +++ b/osfmk/kern/ipc_tt.c @@ -98,9 +98,16 @@ #include +#if CONFIG_EMBEDDED && !SECURE_KERNEL +extern int cs_relax_platform_task_ports; +#endif + /* forward declarations */ task_t convert_port_to_locked_task(ipc_port_t port); - +task_inspect_t convert_port_to_locked_task_inspect(ipc_port_t port); +static void ipc_port_bind_special_reply_port_locked(ipc_port_t port); +static kern_return_t ipc_port_unbind_special_reply_port(thread_t thread, boolean_t unbind_active_port); +kern_return_t task_conversion_eval(task_t caller, task_t victim); /* * Routine: ipc_task_init @@ -143,10 +150,24 @@ ipc_task_init( task->itk_self = kport; task->itk_nself = nport; task->itk_resume = IP_NULL; /* Lazily allocated on-demand */ - task->itk_sself = ipc_port_make_send(kport); + if (task_is_a_corpse_fork(task)) { + /* + * No sender's notification for corpse would not + * work with a naked send right in kernel. + */ + task->itk_sself = IP_NULL; + } else { + task->itk_sself = ipc_port_make_send(kport); + } task->itk_debug_control = IP_NULL; task->itk_space = space; +#if CONFIG_MACF + for (i = FIRST_EXCEPTION; i < EXC_TYPES_COUNT; i++) { + mac_exc_associate_action_label(&task->exc_actions[i], mac_exc_create_label()); + } +#endif + if (parent == TASK_NULL) { ipc_port_t port; @@ -186,6 +207,9 @@ ipc_task_init( parent->exc_actions[i].behavior; task->exc_actions[i].privileged = parent->exc_actions[i].privileged; +#if CONFIG_MACF + mac_exc_inherit_action_label(parent->exc_actions + i, task->exc_actions + i); +#endif }/* for */ task->itk_host = ipc_port_copy_send(parent->itk_host); @@ -320,6 +344,9 @@ ipc_task_terminate( if (IP_VALID(task->exc_actions[i].port)) { ipc_port_release_send(task->exc_actions[i].port); } +#if CONFIG_MACF + mac_exc_free_action_label(task->exc_actions + i); +#endif } if (IP_VALID(task->itk_host)) @@ -374,6 +401,11 @@ ipc_task_reset( ipc_port_t old_exc_actions[EXC_TYPES_COUNT]; int i; +#if CONFIG_MACF + /* Fresh label to unset credentials in existing labels. */ + struct label *unset_label = mac_exc_create_label(); +#endif + new_kport = ipc_port_alloc_kernel(); if (new_kport == IP_NULL) panic("ipc_task_reset"); @@ -386,13 +418,22 @@ ipc_task_reset( /* the task is already terminated (can this happen?) */ itk_unlock(task); ipc_port_dealloc_kernel(new_kport); +#if CONFIG_MACF + mac_exc_free_label(unset_label); +#endif return; } task->itk_self = new_kport; old_sself = task->itk_sself; task->itk_sself = ipc_port_make_send(new_kport); - ipc_kobject_set(old_kport, IKO_NULL, IKOT_NONE); + + /* Set the old kport to IKOT_NONE and update the exec token while under the port lock */ + ip_lock(old_kport); + ipc_kobject_set_atomically(old_kport, IKO_NULL, IKOT_NONE); + task->exec_token += 1; + ip_unlock(old_kport); + ipc_kobject_set(new_kport, (ipc_kobject_t) task, IKOT_TASK); for (i = FIRST_EXCEPTION; i < EXC_TYPES_COUNT; i++) { @@ -403,6 +444,9 @@ ipc_task_reset( } if (!task->exc_actions[i].privileged) { +#if CONFIG_MACF + mac_exc_update_action_label(task->exc_actions + i, unset_label); +#endif old_exc_actions[i] = task->exc_actions[i].port; task->exc_actions[i].port = IP_NULL; } @@ -415,6 +459,10 @@ ipc_task_reset( itk_unlock(task); +#if CONFIG_MACF + mac_exc_free_label(unset_label); +#endif + /* release the naked send rights */ if (IP_VALID(old_sself)) @@ -450,6 +498,7 @@ ipc_thread_init( thread->ith_self = kport; thread->ith_sself = ipc_port_make_send(kport); + thread->ith_special_reply_port = NULL; thread->exc_actions = NULL; ipc_kobject_set(kport, (ipc_kobject_t)thread, IKOT_THREAD); @@ -471,6 +520,12 @@ ipc_thread_init_exc_actions( thread->exc_actions = kalloc(sizeof(struct exception_action) * EXC_TYPES_COUNT); bzero(thread->exc_actions, sizeof(struct exception_action) * EXC_TYPES_COUNT); + +#if CONFIG_MACF + for (size_t i = 0; i < EXC_TYPES_COUNT; ++i) { + mac_exc_associate_action_label(thread->exc_actions + i, mac_exc_create_label()); + } +#endif } void @@ -478,6 +533,12 @@ ipc_thread_destroy_exc_actions( thread_t thread) { if (thread->exc_actions != NULL) { +#if CONFIG_MACF + for (size_t i = 0; i < EXC_TYPES_COUNT; ++i) { + mac_exc_free_action_label(thread->exc_actions + i); + } +#endif + kfree(thread->exc_actions, sizeof(struct exception_action) * EXC_TYPES_COUNT); thread->exc_actions = NULL; @@ -531,6 +592,11 @@ ipc_thread_terminate( assert(thread->ith_assertions == 0); #endif + /* unbind the thread special reply port */ + if (IP_VALID(thread->ith_special_reply_port)) { + ipc_port_unbind_special_reply_port(thread, TRUE); + } + assert(ipc_kmsg_queue_empty(&thread->ith_messages)); if (thread->ith_rpc_reply != IP_NULL) @@ -561,6 +627,10 @@ ipc_thread_reset( boolean_t has_old_exc_actions = FALSE; int i; +#if CONFIG_MACF + struct label *new_label = mac_exc_create_label(); +#endif + new_kport = ipc_port_alloc_kernel(); if (new_kport == IP_NULL) panic("ipc_task_reset"); @@ -573,6 +643,9 @@ ipc_thread_reset( /* the is already terminated (can this happen?) */ thread_mtx_unlock(thread); ipc_port_dealloc_kernel(new_kport); +#if CONFIG_MACF + mac_exc_free_label(new_label); +#endif return; } @@ -594,6 +667,9 @@ ipc_thread_reset( if (thread->exc_actions[i].privileged) { old_exc_actions[i] = IP_NULL; } else { +#if CONFIG_MACF + mac_exc_update_action_label(thread->exc_actions + i, new_label); +#endif old_exc_actions[i] = thread->exc_actions[i].port; thread->exc_actions[i].port = IP_NULL; } @@ -602,6 +678,10 @@ ipc_thread_reset( thread_mtx_unlock(thread); +#if CONFIG_MACF + mac_exc_free_label(new_label); +#endif + /* release the naked send rights */ if (IP_VALID(old_sself)) @@ -617,6 +697,11 @@ ipc_thread_reset( if (old_kport != IP_NULL) { ipc_port_dealloc_kernel(old_kport); } + + /* unbind the thread special reply port */ + if (IP_VALID(thread->ith_special_reply_port)) { + ipc_port_unbind_special_reply_port(thread, TRUE); + } } /* @@ -633,9 +718,9 @@ ipc_thread_reset( ipc_port_t retrieve_task_self_fast( - register task_t task) + task_t task) { - register ipc_port_t port; + ipc_port_t port; assert(task == current_task()); @@ -673,7 +758,7 @@ ipc_port_t retrieve_thread_self_fast( thread_t thread) { - register ipc_port_t port; + ipc_port_t port; assert(thread == current_thread()); @@ -775,6 +860,121 @@ mach_reply_port( return name; } +/* + * Routine: thread_get_special_reply_port [mach trap] + * Purpose: + * Allocate a special reply port for the calling thread. + * Conditions: + * Nothing locked. + * Returns: + * mach_port_name_t: send right & receive right for special reply port. + * MACH_PORT_NULL if there are any resource failures + * or other errors. + */ + +mach_port_name_t +thread_get_special_reply_port( + __unused struct thread_get_special_reply_port_args *args) +{ + ipc_port_t port; + mach_port_name_t name; + mach_port_name_t send_name; + kern_return_t kr; + thread_t thread = current_thread(); + + /* unbind the thread special reply port */ + if (IP_VALID(thread->ith_special_reply_port)) { + kr = ipc_port_unbind_special_reply_port(thread, TRUE); + if (kr != KERN_SUCCESS) { + return MACH_PORT_NULL; + } + } + + kr = ipc_port_alloc(current_task()->itk_space, &name, &port); + if (kr == KERN_SUCCESS) { + ipc_port_bind_special_reply_port_locked(port); + + /* Make a send right and insert it in the space at specified name */ + ipc_port_make_send_locked(port); + ip_unlock(port); + send_name = ipc_port_copyout_name_send(port, current_task()->itk_space, name); + /* + * If insertion of send right failed, userland is doing something bad, error out. + * The space was marked inactive or the receive right just inserted above at the + * given name was moved, in either case do not try to deallocate the receive right. + */ + if (send_name == MACH_PORT_NULL || send_name == MACH_PORT_DEAD) { + if (IP_VALID(thread->ith_special_reply_port)) { + ipc_port_unbind_special_reply_port(thread, TRUE); + } + name = MACH_PORT_NULL; + } + } else { + name = MACH_PORT_NULL; + } + return name; +} + +/* + * Routine: ipc_port_bind_special_reply_port_locked + * Purpose: + * Bind the given port to current thread as a special reply port. + * Conditions: + * Port locked. + * Returns: + * None. + */ + +static void +ipc_port_bind_special_reply_port_locked( + ipc_port_t port) +{ + thread_t thread = current_thread(); + assert(thread->ith_special_reply_port == NULL); + + ip_reference(port); + thread->ith_special_reply_port = port; + port->ip_specialreply = 1; + port->ip_sync_link_state = PORT_SYNC_LINK_ANY; + + reset_ip_srp_bits(port); +} + +/* + * Routine: ipc_port_unbind_special_reply_port + * Purpose: + * Unbind the thread's special reply port. + * If the special port has threads waiting on turnstile, + * update it's inheritor. + * Condition: + * Nothing locked. + * Returns: + * None. + */ +static kern_return_t +ipc_port_unbind_special_reply_port( + thread_t thread, + boolean_t unbind_active_port) +{ + ipc_port_t special_reply_port = thread->ith_special_reply_port; + + ip_lock(special_reply_port); + + /* Return error if port active and unbind_active_port set to FALSE */ + if (unbind_active_port == FALSE && ip_active(special_reply_port)) { + ip_unlock(special_reply_port); + return KERN_FAILURE; + } + + thread->ith_special_reply_port = NULL; + ipc_port_adjust_special_reply_port_locked(special_reply_port, NULL, + IPC_PORT_ADJUST_SR_CLEAR_SPECIAL_REPLY, FALSE); + /* port unlocked */ + + ip_release(special_reply_port); + return KERN_SUCCESS; +} + /* * Routine: thread_get_special_port [kernel call] * Purpose: @@ -909,36 +1109,36 @@ task_get_special_port( } switch (which) { - case TASK_KERNEL_PORT: + case TASK_KERNEL_PORT: port = ipc_port_copy_send(task->itk_sself); break; - case TASK_NAME_PORT: + case TASK_NAME_PORT: port = ipc_port_make_send(task->itk_nself); break; - case TASK_HOST_PORT: + case TASK_HOST_PORT: port = ipc_port_copy_send(task->itk_host); break; - case TASK_BOOTSTRAP_PORT: + case TASK_BOOTSTRAP_PORT: port = ipc_port_copy_send(task->itk_bootstrap); break; - case TASK_SEATBELT_PORT: + case TASK_SEATBELT_PORT: port = ipc_port_copy_send(task->itk_seatbelt); break; - case TASK_ACCESS_PORT: + case TASK_ACCESS_PORT: port = ipc_port_copy_send(task->itk_task_access); break; - case TASK_DEBUG_CONTROL_PORT: + case TASK_DEBUG_CONTROL_PORT: port = ipc_port_copy_send(task->itk_debug_control); break; - default: - itk_unlock(task); + default: + itk_unlock(task); return KERN_INVALID_ARGUMENT; } itk_unlock(task); @@ -976,33 +1176,32 @@ task_set_special_port( return KERN_INVALID_ARGUMENT; switch (which) { - case TASK_KERNEL_PORT: - whichp = &task->itk_sself; - break; + case TASK_KERNEL_PORT: + whichp = &task->itk_sself; + break; - case TASK_HOST_PORT: - whichp = &task->itk_host; - break; + case TASK_HOST_PORT: + whichp = &task->itk_host; + break; - case TASK_BOOTSTRAP_PORT: - whichp = &task->itk_bootstrap; - break; + case TASK_BOOTSTRAP_PORT: + whichp = &task->itk_bootstrap; + break; - case TASK_SEATBELT_PORT: - whichp = &task->itk_seatbelt; - break; + case TASK_SEATBELT_PORT: + whichp = &task->itk_seatbelt; + break; - case TASK_ACCESS_PORT: - whichp = &task->itk_task_access; - break; - - case TASK_DEBUG_CONTROL_PORT: - whichp = &task->itk_debug_control; - break; + case TASK_ACCESS_PORT: + whichp = &task->itk_task_access; + break; + case TASK_DEBUG_CONTROL_PORT: + whichp = &task->itk_debug_control; + break; - default: - return KERN_INVALID_ARGUMENT; + default: + return KERN_INVALID_ARGUMENT; }/* switch */ itk_lock(task); @@ -1167,6 +1366,50 @@ mach_ports_lookup( return KERN_SUCCESS; } +kern_return_t +task_conversion_eval(task_t caller, task_t victim) +{ + /* + * Tasks are allowed to resolve their own task ports, and the kernel is + * allowed to resolve anyone's task port. + */ + if (caller == kernel_task) { + return KERN_SUCCESS; + } + + if (caller == victim) { + return KERN_SUCCESS; + } + + /* + * Only the kernel can can resolve the kernel's task port. We've established + * by this point that the caller is not kernel_task. + */ + if (victim == TASK_NULL || victim == kernel_task) { + return KERN_INVALID_SECURITY; + } + +#if CONFIG_EMBEDDED + /* + * On embedded platforms, only a platform binary can resolve the task port + * of another platform binary. + */ + if ((victim->t_flags & TF_PLATFORM) && !(caller->t_flags & TF_PLATFORM)) { +#if SECURE_KERNEL + return KERN_INVALID_SECURITY; +#else + if (cs_relax_platform_task_ports) { + return KERN_SUCCESS; + } else { + return KERN_INVALID_SECURITY; + } +#endif /* SECURE_KERNEL */ + } +#endif /* CONFIG_EMBEDDED */ + + return KERN_SUCCESS; +} + /* * Routine: convert_port_to_locked_task * Purpose: @@ -1179,9 +1422,10 @@ mach_ports_lookup( task_t convert_port_to_locked_task(ipc_port_t port) { - int try_failed_count = 0; + int try_failed_count = 0; while (IP_VALID(port)) { + task_t ct = current_task(); task_t task; ip_lock(port); @@ -1192,6 +1436,11 @@ convert_port_to_locked_task(ipc_port_t port) task = (task_t) port->ip_kobject; assert(task != TASK_NULL); + if (task_conversion_eval(ct, task)) { + ip_unlock(port); + return TASK_NULL; + } + /* * Normal lock ordering puts task_lock() before ip_lock(). * Attempt out-of-order locking here. @@ -1208,6 +1457,47 @@ convert_port_to_locked_task(ipc_port_t port) return TASK_NULL; } +/* + * Routine: convert_port_to_locked_task_inspect + * Purpose: + * Internal helper routine to convert from a port to a locked + * task inspect right. Used by internal routines that try to convert from a + * task inspect port to a reference on some task related object. + * Conditions: + * Nothing locked, blocking OK. + */ +task_inspect_t +convert_port_to_locked_task_inspect(ipc_port_t port) +{ + int try_failed_count = 0; + + while (IP_VALID(port)) { + task_inspect_t task; + + ip_lock(port); + if (!ip_active(port) || (ip_kotype(port) != IKOT_TASK)) { + ip_unlock(port); + return TASK_INSPECT_NULL; + } + task = (task_inspect_t)port->ip_kobject; + assert(task != TASK_INSPECT_NULL); + /* + * Normal lock ordering puts task_lock() before ip_lock(). + * Attempt out-of-order locking here. + */ + if (task_lock_try((task_t)task)) { + ip_unlock(port); + return task; + } + try_failed_count++; + + ip_unlock(port); + mutex_pause(try_failed_count); + } + return TASK_INSPECT_NULL; +} + + /* * Routine: convert_port_to_task * Purpose: @@ -1220,6 +1510,24 @@ convert_port_to_locked_task(ipc_port_t port) task_t convert_port_to_task( ipc_port_t port) +{ + return convert_port_to_task_with_exec_token(port, NULL); +} + +/* + * Routine: convert_port_to_task_with_exec_token + * Purpose: + * Convert from a port to a task and return + * the exec token stored in the task. + * Doesn't consume the port ref; produces a task ref, + * which may be null. + * Conditions: + * Nothing locked. + */ +task_t +convert_port_to_task_with_exec_token( + ipc_port_t port, + uint32_t *exec_token) { task_t task = TASK_NULL; @@ -1228,9 +1536,18 @@ convert_port_to_task( if ( ip_active(port) && ip_kotype(port) == IKOT_TASK ) { + task_t ct = current_task(); task = (task_t)port->ip_kobject; assert(task != TASK_NULL); + if (task_conversion_eval(ct, task)) { + ip_unlock(port); + return TASK_NULL; + } + + if (exec_token) { + *exec_token = task->exec_token; + } task_reference_internal(task); } @@ -1273,6 +1590,38 @@ convert_port_to_task_name( return (task); } +/* + * Routine: convert_port_to_task_inspect + * Purpose: + * Convert from a port to a task inspection right + * Doesn't consume the port ref; produces a task ref, + * which may be null. + * Conditions: + * Nothing locked. + */ +task_inspect_t +convert_port_to_task_inspect( + ipc_port_t port) +{ + task_inspect_t task = TASK_INSPECT_NULL; + + if (IP_VALID(port)) { + ip_lock(port); + + if (ip_active(port) && + ip_kotype(port) == IKOT_TASK) { + task = (task_inspect_t)port->ip_kobject; + assert(task != TASK_INSPECT_NULL); + + task_reference_internal(task); + } + + ip_unlock(port); + } + + return (task); +} + /* * Routine: convert_port_to_task_suspension_token * Purpose: @@ -1337,6 +1686,38 @@ convert_port_to_space( return (space); } +/* + * Routine: convert_port_to_space_inspect + * Purpose: + * Convert from a port to a space inspect right. + * Doesn't consume the port ref; produces a space inspect ref, + * which may be null. + * Conditions: + * Nothing locked. + */ +ipc_space_inspect_t +convert_port_to_space_inspect( + ipc_port_t port) +{ + ipc_space_inspect_t space; + task_inspect_t task; + + task = convert_port_to_locked_task_inspect(port); + + if (task == TASK_INSPECT_NULL) + return IPC_SPACE_INSPECT_NULL; + + if (!task->active) { + task_unlock(task); + return IPC_SPACE_INSPECT_NULL; + } + + space = (ipc_space_inspect_t)task->itk_space; + is_reference((ipc_space_t)space); + task_unlock((task_t)task); + return space; +} + /* * Routine: convert_port_to_map * Purpose: @@ -1390,11 +1771,17 @@ convert_port_to_thread( if (IP_VALID(port)) { ip_lock(port); - if ( ip_active(port) && - ip_kotype(port) == IKOT_THREAD ) { + if (ip_active(port) && + ip_kotype(port) == IKOT_THREAD) { thread = (thread_t)port->ip_kobject; assert(thread != THREAD_NULL); + /* Use task conversion rules for thread control conversions */ + if (task_conversion_eval(current_task(), thread->task) != KERN_SUCCESS) { + ip_unlock(port); + return THREAD_NULL; + } + thread_reference_internal(thread); } @@ -1404,6 +1791,55 @@ convert_port_to_thread( return (thread); } +/* + * Routine: convert_port_to_thread_inspect + * Purpose: + * Convert from a port to a thread inspection right + * Doesn't consume the port ref; produces a thread ref, + * which may be null. + * Conditions: + * Nothing locked. + */ +thread_inspect_t +convert_port_to_thread_inspect( + ipc_port_t port) +{ + thread_inspect_t thread = THREAD_INSPECT_NULL; + + if (IP_VALID(port)) { + ip_lock(port); + + if (ip_active(port) && + ip_kotype(port) == IKOT_THREAD) { + thread = (thread_inspect_t)port->ip_kobject; + assert(thread != THREAD_INSPECT_NULL); + thread_reference_internal((thread_t)thread); + } + ip_unlock(port); + } + + return thread; +} + +/* + * Routine: convert_thread_inspect_to_port + * Purpose: + * Convert from a thread inspect reference to a port. + * Consumes a thread ref; + * As we never export thread inspect ports, always + * creates a NULL port. + * Conditions: + * Nothing locked. + */ + +ipc_port_t +convert_thread_inspect_to_port(thread_inspect_t thread) +{ + thread_deallocate(thread); + return IP_NULL; +} + + /* * Routine: port_name_to_thread * Purpose: @@ -1460,6 +1896,56 @@ port_name_to_task( return task; } +task_inspect_t +port_name_to_task_inspect( + mach_port_name_t name) +{ + ipc_port_t kern_port; + kern_return_t kr; + task_inspect_t ti = TASK_INSPECT_NULL; + + if (MACH_PORT_VALID(name)) { + kr = ipc_object_copyin(current_space(), name, + MACH_MSG_TYPE_COPY_SEND, + (ipc_object_t *)&kern_port); + if (kr != KERN_SUCCESS) + return TASK_NULL; + + ti = convert_port_to_task_inspect(kern_port); + + if (IP_VALID(kern_port)) + ipc_port_release_send(kern_port); + } + return ti; +} + +/* + * Routine: port_name_to_host + * Purpose: + * Convert from a port name to a host pointer. + * NOTE: This does _not_ return a +1 reference to the host_t + * Conditions: + * Nothing locked. + */ +host_t +port_name_to_host( + mach_port_name_t name) +{ + + host_t host = HOST_NULL; + kern_return_t kr; + ipc_port_t port; + + if (MACH_PORT_VALID(name)) { + kr = ipc_port_translate_send(current_space(), name, &port); + if (kr == KERN_SUCCESS) { + host = convert_port_to_host(port); + ip_unlock(port); + } + } + return host; +} + /* * Routine: convert_task_to_port * Purpose: @@ -1477,16 +1963,37 @@ convert_task_to_port( ipc_port_t port; itk_lock(task); + if (task->itk_self != IP_NULL) port = ipc_port_make_send(task->itk_self); else port = IP_NULL; + itk_unlock(task); task_deallocate(task); return port; } +/* + * Routine: convert_task_inspect_to_port + * Purpose: + * Convert from a task inspect reference to a port. + * Consumes a task ref; + * As we never export task inspect ports, always + * creates a NULL port. + * Conditions: + * Nothing locked. + */ +ipc_port_t +convert_task_inspect_to_port( + task_inspect_t task) +{ + task_deallocate(task); + + return IP_NULL; +} + /* * Routine: convert_task_suspend_token_to_port * Purpose: @@ -1604,6 +2111,22 @@ space_deallocate( is_release(space); } +/* + * Routine: space_inspect_deallocate + * Purpose: + * Deallocate a space inspect ref produced by convert_port_to_space_inspect. + * Conditions: + * Nothing locked. + */ + +void +space_inspect_deallocate( + ipc_space_inspect_t space) +{ + if (space != IS_INSPECT_NULL) + is_release((ipc_space_t)space); +} + /* * Routine: thread/task_set_exception_ports [kernel call] * Purpose: @@ -1634,6 +2157,10 @@ thread_set_exception_ports( boolean_t privileged = current_task()->sec_token.val[0] == 0; register int i; +#if CONFIG_MACF + struct label *new_label; +#endif + if (thread == THREAD_NULL) return (KERN_INVALID_ARGUMENT); @@ -1661,6 +2188,10 @@ thread_set_exception_ports( if (new_flavor != 0 && !VALID_THREAD_STATE_FLAVOR(new_flavor)) return (KERN_INVALID_ARGUMENT); +#if CONFIG_MACF + new_label = mac_exc_create_label_for_current_proc(); +#endif + thread_mtx_lock(thread); if (!thread->active) { @@ -1673,7 +2204,11 @@ thread_set_exception_ports( ipc_thread_init_exc_actions(thread); } for (i = FIRST_EXCEPTION; i < EXC_TYPES_COUNT; ++i) { - if (exception_mask & (1 << i)) { + if ((exception_mask & (1 << i)) +#if CONFIG_MACF + && mac_exc_update_action_label(&thread->exc_actions[i], new_label) == 0 +#endif + ) { old_port[i] = thread->exc_actions[i].port; thread->exc_actions[i].port = ipc_port_copy_send(new_port); thread->exc_actions[i].behavior = new_behavior; @@ -1686,6 +2221,10 @@ thread_set_exception_ports( thread_mtx_unlock(thread); +#if CONFIG_MACF + mac_exc_free_label(new_label); +#endif + for (i = FIRST_EXCEPTION; i < EXC_TYPES_COUNT; ++i) if (IP_VALID(old_port[i])) ipc_port_release_send(old_port[i]); @@ -1708,6 +2247,10 @@ task_set_exception_ports( boolean_t privileged = current_task()->sec_token.val[0] == 0; register int i; +#if CONFIG_MACF + struct label *new_label; +#endif + if (task == TASK_NULL) return (KERN_INVALID_ARGUMENT); @@ -1735,6 +2278,10 @@ task_set_exception_ports( if (new_flavor != 0 && !VALID_THREAD_STATE_FLAVOR(new_flavor)) return (KERN_INVALID_ARGUMENT); +#if CONFIG_MACF + new_label = mac_exc_create_label_for_current_proc(); +#endif + itk_lock(task); if (task->itk_self == IP_NULL) { @@ -1744,7 +2291,11 @@ task_set_exception_ports( } for (i = FIRST_EXCEPTION; i < EXC_TYPES_COUNT; ++i) { - if (exception_mask & (1 << i)) { + if ((exception_mask & (1 << i)) +#if CONFIG_MACF + && mac_exc_update_action_label(&task->exc_actions[i], new_label) == 0 +#endif + ) { old_port[i] = task->exc_actions[i].port; task->exc_actions[i].port = ipc_port_copy_send(new_port); @@ -1758,6 +2309,10 @@ task_set_exception_ports( itk_unlock(task); +#if CONFIG_MACF + mac_exc_free_label(new_label); +#endif + for (i = FIRST_EXCEPTION; i < EXC_TYPES_COUNT; ++i) if (IP_VALID(old_port[i])) ipc_port_release_send(old_port[i]); @@ -1812,6 +2367,10 @@ thread_swap_exception_ports( boolean_t privileged = current_task()->sec_token.val[0] == 0; unsigned int i, j, count; +#if CONFIG_MACF + struct label *new_label; +#endif + if (thread == THREAD_NULL) return (KERN_INVALID_ARGUMENT); @@ -1834,6 +2393,10 @@ thread_swap_exception_ports( if (new_flavor != 0 && !VALID_THREAD_STATE_FLAVOR(new_flavor)) return (KERN_INVALID_ARGUMENT); +#if CONFIG_MACF + new_label = mac_exc_create_label_for_current_proc(); +#endif + thread_mtx_lock(thread); if (!thread->active) { @@ -1848,7 +2411,11 @@ thread_swap_exception_ports( assert(EXC_TYPES_COUNT > FIRST_EXCEPTION); for (count = 0, i = FIRST_EXCEPTION; i < EXC_TYPES_COUNT && count < *CountCnt; ++i) { - if (exception_mask & (1 << i)) { + if ((exception_mask & (1 << i)) +#if CONFIG_MACF + && mac_exc_update_action_label(&thread->exc_actions[i], new_label) == 0 +#endif + ) { for (j = 0; j < count; ++j) { /* * search for an identical entry, if found @@ -1883,6 +2450,10 @@ thread_swap_exception_ports( thread_mtx_unlock(thread); +#if CONFIG_MACF + mac_exc_free_label(new_label); +#endif + while (--i >= FIRST_EXCEPTION) { if (IP_VALID(old_port[i])) ipc_port_release_send(old_port[i]); @@ -1913,6 +2484,10 @@ task_swap_exception_ports( boolean_t privileged = current_task()->sec_token.val[0] == 0; unsigned int i, j, count; +#if CONFIG_MACF + struct label *new_label; +#endif + if (task == TASK_NULL) return (KERN_INVALID_ARGUMENT); @@ -1935,6 +2510,10 @@ task_swap_exception_ports( if (new_flavor != 0 && !VALID_THREAD_STATE_FLAVOR(new_flavor)) return (KERN_INVALID_ARGUMENT); +#if CONFIG_MACF + new_label = mac_exc_create_label_for_current_proc(); +#endif + itk_lock(task); if (task->itk_self == IP_NULL) { @@ -1945,7 +2524,11 @@ task_swap_exception_ports( assert(EXC_TYPES_COUNT > FIRST_EXCEPTION); for (count = 0, i = FIRST_EXCEPTION; i < EXC_TYPES_COUNT && count < *CountCnt; ++i) { - if (exception_mask & (1 << i)) { + if ((exception_mask & (1 << i)) +#if CONFIG_MACF + && mac_exc_update_action_label(&task->exc_actions[i], new_label) == 0 +#endif + ) { for (j = 0; j < count; j++) { /* * search for an identical entry, if found @@ -1980,6 +2563,10 @@ task_swap_exception_ports( itk_unlock(task); +#if CONFIG_MACF + mac_exc_free_label(new_label); +#endif + while (--i >= FIRST_EXCEPTION) { if (IP_VALID(old_port[i])) ipc_port_release_send(old_port[i]);