X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..490019cf9519204c5fb36b2fba54ceb983bb6b72:/osfmk/kern/ipc_host.c diff --git a/osfmk/kern/ipc_host.c b/osfmk/kern/ipc_host.c index 69d620e8c..88e629de4 100644 --- a/osfmk/kern/ipc_host.c +++ b/osfmk/kern/ipc_host.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2007 Apple Inc. All rights reserved. + * Copyright (c) 2000-2009 Apple Inc. All rights reserved. * * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * @@ -67,7 +67,6 @@ #include #include #include -#include #include #include #include @@ -77,18 +76,14 @@ #include #include +#if CONFIG_MACF +#include +#endif + /* * Forward declarations */ -void -ipc_processor_terminate( - processor_t processor); - -void -ipc_processor_disable( - processor_t processor); - boolean_t ref_pset_port_locked( ipc_port_t port, boolean_t matchn, processor_set_t *ppset); @@ -97,12 +92,15 @@ ref_pset_port_locked( * ipc_host_init: set up various things. */ +extern lck_grp_t host_notify_lock_grp; +extern lck_attr_t host_notify_lock_attr; + void ipc_host_init(void) { ipc_port_t port; int i; - mutex_init(&realhost.lock, 0); + lck_mtx_init(&realhost.lock, &host_notify_lock_grp, &host_notify_lock_attr); /* * Allocate and set up the two host ports. @@ -205,51 +203,6 @@ ipc_processor_enable( myport = processor->processor_self; ipc_kobject_set(myport, (ipc_kobject_t) processor, IKOT_PROCESSOR); } - -/* - * ipc_processor_disable: - * - * Disable ipc control of processor by clearing port object. - */ -void -ipc_processor_disable( - processor_t processor) -{ - ipc_port_t myport; - - myport = processor->processor_self; - if (myport == IP_NULL) - return; - ipc_kobject_set(myport, IKO_NULL, IKOT_NONE); -} - -/* - * ipc_processor_terminate: - * - * Processor is off-line. Destroy ipc control port. - */ -void -ipc_processor_terminate( - processor_t processor) -{ - ipc_port_t myport; - spl_t s; - - s = splsched(); - processor_lock(processor); - myport = processor->processor_self; - if (myport == IP_NULL) { - processor_unlock(processor); - splx(s); - return; - } - - processor->processor_self = IP_NULL; - processor_unlock(processor); - splx(s); - - ipc_port_dealloc_kernel(myport); -} /* * ipc_pset_init: @@ -480,6 +433,7 @@ convert_host_to_port( * Purpose: * Convert from a processor to a port. * Produces a naked send right which may be invalid. + * Processors are not reference counted, so nothing to release. * Conditions: * Nothing locked. */ @@ -488,20 +442,10 @@ ipc_port_t convert_processor_to_port( processor_t processor) { - ipc_port_t port; - spl_t s; - - s = splsched(); - processor_lock(processor); - - if (processor->processor_self != IP_NULL) - port = ipc_port_make_send(processor->processor_self); - else - port = IP_NULL; - - processor_unlock(processor); - splx(s); + ipc_port_t port = processor->processor_self; + if (port != IP_NULL) + port = ipc_port_make_send(port); return port; } @@ -509,8 +453,8 @@ convert_processor_to_port( * Routine: convert_pset_to_port * Purpose: * Convert from a pset to a port. - * Produces a naked send right - * which may be invalid. + * Produces a naked send right which may be invalid. + * Processor sets are not reference counted, so nothing to release. * Conditions: * Nothing locked. */ @@ -531,8 +475,8 @@ convert_pset_to_port( * Routine: convert_pset_name_to_port * Purpose: * Convert from a pset to a port. - * Produces a naked send right - * which may be invalid. + * Produces a naked send right which may be invalid. + * Processor sets are not reference counted, so nothing to release. * Conditions: * Nothing locked. */ @@ -593,7 +537,7 @@ convert_port_to_host_security( */ kern_return_t host_set_exception_ports( - host_priv_t host_priv, + host_priv_t host_priv, exception_mask_t exception_mask, ipc_port_t new_port, exception_behavior_t new_behavior, @@ -606,9 +550,7 @@ host_set_exception_ports( return KERN_INVALID_ARGUMENT; } - assert(host_priv == &realhost); - - if (exception_mask & ~EXC_MASK_ALL) { + if (exception_mask & ~EXC_MASK_VALID) { return KERN_INVALID_ARGUMENT; } @@ -622,10 +564,22 @@ host_set_exception_ports( return KERN_INVALID_ARGUMENT; } } - /* Cannot easily check "new_flavor", but that just means that - * the flavor in the generated exception message might be garbage: - * GIGO + + /* + * Check the validity of the thread_state_flavor by calling the + * VALID_THREAD_STATE_FLAVOR architecture dependent macro defined in + * osfmk/mach/ARCHITECTURE/thread_status.h */ + if (new_flavor != 0 && !VALID_THREAD_STATE_FLAVOR(new_flavor)) + return (KERN_INVALID_ARGUMENT); + +#if CONFIG_MACF + if (mac_task_check_set_host_exception_ports(current_task(), exception_mask) != 0) + return KERN_NO_ACCESS; +#endif + + assert(host_priv == &realhost); + host_lock(host_priv); for (i = FIRST_EXCEPTION; i < EXC_TYPES_COUNT; i++) { @@ -685,7 +639,7 @@ host_get_exception_ports( if (host_priv == HOST_PRIV_NULL) return KERN_INVALID_ARGUMENT; - if (exception_mask & ~EXC_MASK_ALL) { + if (exception_mask & ~EXC_MASK_VALID) { return KERN_INVALID_ARGUMENT; } @@ -731,7 +685,7 @@ host_get_exception_ports( kern_return_t host_swap_exception_ports( - host_priv_t host_priv, + host_priv_t host_priv, exception_mask_t exception_mask, ipc_port_t new_port, exception_behavior_t new_behavior, @@ -750,7 +704,7 @@ host_swap_exception_ports( if (host_priv == HOST_PRIV_NULL) return KERN_INVALID_ARGUMENT; - if (exception_mask & ~EXC_MASK_ALL) { + if (exception_mask & ~EXC_MASK_VALID) { return KERN_INVALID_ARGUMENT; } @@ -764,15 +718,19 @@ host_swap_exception_ports( return KERN_INVALID_ARGUMENT; } } - /* Cannot easily check "new_flavor", but that just means that - * the flavor in the generated exception message might be garbage: - * GIGO */ - host_lock(host_priv); + if (new_flavor != 0 && !VALID_THREAD_STATE_FLAVOR(new_flavor)) + return (KERN_INVALID_ARGUMENT); - count = 0; +#if CONFIG_MACF + if (mac_task_check_set_host_exception_ports(current_task(), exception_mask) != 0) + return KERN_NO_ACCESS; +#endif /* CONFIG_MACF */ - for (i = FIRST_EXCEPTION; i < EXC_TYPES_COUNT; i++) { + host_lock(host_priv); + + assert(EXC_TYPES_COUNT > FIRST_EXCEPTION); + for (count=0, i = FIRST_EXCEPTION; i < EXC_TYPES_COUNT && count < *CountCnt; i++) { if (exception_mask & (1 << i)) { for (j = 0; j < count; j++) { /* @@ -800,9 +758,6 @@ host_swap_exception_ports( ipc_port_copy_send(new_port); host_priv->exc_actions[i].behavior = new_behavior; host_priv->exc_actions[i].flavor = new_flavor; - if (count > *CountCnt) { - break; - } } else old_port[i] = IP_NULL; }/* for */ @@ -811,9 +766,11 @@ host_swap_exception_ports( /* * Consume send rights without any lock held. */ - for (i = FIRST_EXCEPTION; i < EXC_TYPES_COUNT; i++) + while (--i >= FIRST_EXCEPTION) { if (IP_VALID(old_port[i])) ipc_port_release_send(old_port[i]); + } + if (IP_VALID(new_port)) /* consume send right */ ipc_port_release_send(new_port); *CountCnt = count;