xnu-3248.60.10.tar.gz

[apple/xnu.git] / osfmk / ipc / mach_debug.c

diff --git a/osfmk/ipc/mach_debug.c b/osfmk/ipc/mach_debug.c
index cc0acd9127d0156109b7a4adbb56149dc760a5c7..25c472e15b962a9c18982320bf6faddcf3af1dbc 100644 (file)
--- a/osfmk/ipc/mach_debug.c
+++ b/osfmk/ipc/mach_debug.c
@@ -84,6 +84,8 @@
 #include <ipc/ipc_hash.h>
 #include <ipc/ipc_table.h>
 #include <ipc/ipc_right.h>
 #include <ipc/ipc_hash.h>
 #include <ipc/ipc_table.h>
 #include <ipc/ipc_right.h>

+
+#include <security/mac_mach_internal.h>

 #endif
 
 /*
 #endif
 
 /*


@@ -186,6 +188,12 @@ mach_port_space_info(
        if (space == IS_NULL)
                return KERN_INVALID_TASK;
 
        if (space == IS_NULL)
                return KERN_INVALID_TASK;
 

+#if !(DEVELOPMENT | DEBUG)
+       const boolean_t dbg_ok = (mac_task_check_expose_task(kernel_task) == 0);
+#else
+       const boolean_t dbg_ok = TRUE;
+#endif
+

        /* start with in-line memory */
 
        table_size = 0;
        /* start with in-line memory */
 
        table_size = 0;


@@ -213,7 +221,7 @@ mach_port_space_info(
                if (table_size != table_size_needed) {
                        if (table_size != 0)
                                kmem_free(ipc_kernel_map, table_addr, table_size);
                if (table_size != table_size_needed) {
                        if (table_size != 0)
                                kmem_free(ipc_kernel_map, table_addr, table_size);

-                       kr = kmem_alloc(ipc_kernel_map, &table_addr, table_size_needed);
+                       kr = kmem_alloc(ipc_kernel_map, &table_addr, table_size_needed, VM_KERN_MEMORY_IPC);

                        if (kr != KERN_SUCCESS) {
                                return KERN_RESOURCE_SHORTAGE;
                        }
                        if (kr != KERN_SUCCESS) {
                                return KERN_RESOURCE_SHORTAGE;
                        }


@@ -243,7 +251,7 @@ mach_port_space_info(
                iin->iin_type = IE_BITS_TYPE(bits);
                if ((entry->ie_bits & MACH_PORT_TYPE_PORT_RIGHTS) != MACH_PORT_TYPE_NONE &&
                    entry->ie_request != IE_REQ_NONE) {
                iin->iin_type = IE_BITS_TYPE(bits);
                if ((entry->ie_bits & MACH_PORT_TYPE_PORT_RIGHTS) != MACH_PORT_TYPE_NONE &&
                    entry->ie_request != IE_REQ_NONE) {

-                       ipc_port_t port = (ipc_port_t) entry->ie_object;
+                       __IGNORE_WCASTALIGN(ipc_port_t port = (ipc_port_t) entry->ie_object);

 
                        assert(IP_VALID(port));
                        ip_lock(port);
 
                        assert(IP_VALID(port));
                        ip_lock(port);


@@ -252,7 +260,7 @@ mach_port_space_info(
                }
 
                iin->iin_urefs = IE_BITS_UREFS(bits);
                }
 
                iin->iin_urefs = IE_BITS_UREFS(bits);

-               iin->iin_object = (natural_t)VM_KERNEL_ADDRPERM((uintptr_t)entry->ie_object);
+               iin->iin_object = (dbg_ok) ? (natural_t)VM_KERNEL_ADDRPERM((uintptr_t)entry->ie_object) : 0;

                iin->iin_next = entry->ie_next;
                iin->iin_hash = entry->ie_index;
        }
                iin->iin_next = entry->ie_next;
                iin->iin_hash = entry->ie_index;
        }


@@ -261,9 +269,12 @@ mach_port_space_info(
 
        /* prepare the table out-of-line data for return */
        if (table_size > 0) {
 
        /* prepare the table out-of-line data for return */
        if (table_size > 0) {

-               if (table_size > infop->iis_table_size * sizeof(ipc_info_name_t))
+               vm_size_t used_table_size;
+
+               used_table_size = infop->iis_table_size * sizeof(ipc_info_name_t);
+               if (table_size > used_table_size)

                        bzero((char *)&table_info[infop->iis_table_size],
                        bzero((char *)&table_info[infop->iis_table_size],

-                             table_size - infop->iis_table_size * sizeof(ipc_info_name_t));
+                             table_size - used_table_size);

 
                kr = vm_map_unwire(
                        ipc_kernel_map,
 
                kr = vm_map_unwire(
                        ipc_kernel_map,


@@ -274,7 +285,7 @@ mach_port_space_info(
                        FALSE);
                assert(kr == KERN_SUCCESS);
                kr = vm_map_copyin(ipc_kernel_map, (vm_map_address_t)table_addr, 
                        FALSE);
                assert(kr == KERN_SUCCESS);
                kr = vm_map_copyin(ipc_kernel_map, (vm_map_address_t)table_addr, 

-                                  (vm_map_size_t)table_size, TRUE, &copy);
+                                  (vm_map_size_t)used_table_size, TRUE, &copy);

                assert(kr == KERN_SUCCESS);
                *tablep = (ipc_info_name_t *)copy;
                *tableCntp = infop->iis_table_size;
                assert(kr == KERN_SUCCESS);
                *tablep = (ipc_info_name_t *)copy;
                *tableCntp = infop->iis_table_size;


@@ -465,7 +476,7 @@ mach_port_kobject(
                return KERN_INVALID_RIGHT;
        }
 
                return KERN_INVALID_RIGHT;
        }
 

-       port = (ipc_port_t) entry->ie_object;
+       __IGNORE_WCASTALIGN(port = (ipc_port_t) entry->ie_object);

        assert(port != IP_NULL);
 
        ip_lock(port);
        assert(port != IP_NULL);
 
        ip_lock(port);


@@ -480,10 +491,11 @@ mach_port_kobject(
        kaddr = (mach_vm_address_t)port->ip_kobject;
        ip_unlock(port);
 
        kaddr = (mach_vm_address_t)port->ip_kobject;
        ip_unlock(port);
 

-
+#if (DEVELOPMENT || DEBUG)

        if (0 != kaddr && is_ipc_kobject(*typep))
                *addrp = VM_KERNEL_UNSLIDE_OR_PERM(kaddr);
        else
        if (0 != kaddr && is_ipc_kobject(*typep))
                *addrp = VM_KERNEL_UNSLIDE_OR_PERM(kaddr);
        else

+#endif

                *addrp = 0;
 
        return KERN_SUCCESS;
                *addrp = 0;
 
        return KERN_SUCCESS;