]> git.saurik.com Git - apple/xnu.git/blobdiff - osfmk/ipc/ipc_kmsg.c
xnu-4570.71.2.tar.gz
[apple/xnu.git] / osfmk / ipc / ipc_kmsg.c
index f5737416afa4c434aa8ea783fdbfff673de47e7f..736fe824c8d75eb4c70a54196fa9c3af3b1f4ff8 100644 (file)
 #include <kern/processor.h>
 #include <kern/thread.h>
 #include <kern/sched_prim.h>
-#include <kern/spl.h>
 #include <kern/misc_protos.h>
 #include <kern/counters.h>
 #include <kern/cpu_data.h>
+#include <kern/policy_internal.h>
 
 #include <machine/machlimits.h>
 
 #include <ipc/ipc_hash.h>
 #include <ipc/ipc_table.h>
 #include <ipc/ipc_importance.h>
+#if MACH_FLIPC
+#include <kern/mach_node.h>
+#include <ipc/flipc.h>
+#endif
+
+#include <os/overflow.h>
 
 #include <security/mac_mach_internal.h>
 
+#include <device/device_server.h>
+
 #include <string.h>
 
 #ifdef ppc
@@ -538,6 +546,286 @@ MACRO_BEGIN                                                               \
        }                                                               \
 MACRO_END
 
+#define KMSG_TRACE_FLAG_TRACED     0x000001
+#define KMSG_TRACE_FLAG_COMPLEX    0x000002
+#define KMSG_TRACE_FLAG_OOLMEM     0x000004
+#define KMSG_TRACE_FLAG_VCPY       0x000008
+#define KMSG_TRACE_FLAG_PCPY       0x000010
+#define KMSG_TRACE_FLAG_SND64      0x000020
+#define KMSG_TRACE_FLAG_RAISEIMP   0x000040
+#define KMSG_TRACE_FLAG_APP_SRC    0x000080
+#define KMSG_TRACE_FLAG_APP_DST    0x000100
+#define KMSG_TRACE_FLAG_DAEMON_SRC 0x000200
+#define KMSG_TRACE_FLAG_DAEMON_DST 0x000400
+#define KMSG_TRACE_FLAG_DST_NDFLTQ 0x000800
+#define KMSG_TRACE_FLAG_SRC_NDFLTQ 0x001000
+#define KMSG_TRACE_FLAG_DST_SONCE  0x002000
+#define KMSG_TRACE_FLAG_SRC_SONCE  0x004000
+#define KMSG_TRACE_FLAG_CHECKIN    0x008000
+#define KMSG_TRACE_FLAG_ONEWAY     0x010000
+#define KMSG_TRACE_FLAG_IOKIT      0x020000
+#define KMSG_TRACE_FLAG_SNDRCV     0x040000
+#define KMSG_TRACE_FLAG_DSTQFULL   0x080000
+#define KMSG_TRACE_FLAG_VOUCHER    0x100000
+#define KMSG_TRACE_FLAG_TIMER      0x200000
+#define KMSG_TRACE_FLAG_SEMA       0x400000
+#define KMSG_TRACE_FLAG_DTMPOWNER  0x800000
+
+#define KMSG_TRACE_FLAGS_MASK      0xffffff
+#define KMSG_TRACE_FLAGS_SHIFT     8
+
+#define KMSG_TRACE_PORTS_MASK      0xff
+#define KMSG_TRACE_PORTS_SHIFT     0
+
+#if (KDEBUG_LEVEL >= KDEBUG_LEVEL_STANDARD)
+#include <stdint.h>
+extern boolean_t kdebug_debugid_enabled(uint32_t debugid);
+
+void ipc_kmsg_trace_send(ipc_kmsg_t kmsg,
+                        mach_msg_option_t option)
+{
+       task_t send_task = TASK_NULL;
+       ipc_port_t dst_port, src_port;
+       boolean_t is_task_64bit;
+       mach_msg_header_t *msg;
+       mach_msg_trailer_t *trailer;
+
+       int kotype = 0;
+       uint32_t msg_size = 0;
+       uint32_t msg_flags = KMSG_TRACE_FLAG_TRACED;
+       uint32_t num_ports = 0;
+       uint32_t send_pid, dst_pid;
+
+       /*
+        * check to see not only if ktracing is enabled, but if we will
+        * _actually_ emit the KMSG_INFO tracepoint. This saves us a
+        * significant amount of processing (and a port lock hold) in
+        * the non-tracing case.
+        */
+       if (__probable((kdebug_enable & KDEBUG_TRACE) == 0))
+               return;
+       if (!kdebug_debugid_enabled(MACHDBG_CODE(DBG_MACH_IPC,MACH_IPC_KMSG_INFO)))
+               return;
+
+       msg = kmsg->ikm_header;
+
+       dst_port = (ipc_port_t)(msg->msgh_remote_port);
+       if (!IPC_PORT_VALID(dst_port))
+               return;
+
+       /*
+        * Message properties / options
+        */
+       if ((option & (MACH_SEND_MSG|MACH_RCV_MSG)) == (MACH_SEND_MSG|MACH_RCV_MSG))
+               msg_flags |= KMSG_TRACE_FLAG_SNDRCV;
+
+       if (msg->msgh_id >= is_iokit_subsystem.start &&
+           msg->msgh_id < is_iokit_subsystem.end + 100)
+               msg_flags |= KMSG_TRACE_FLAG_IOKIT;
+       /* magic XPC checkin message id (XPC_MESSAGE_ID_CHECKIN) from libxpc */
+       else if (msg->msgh_id == 0x77303074u /* w00t */)
+               msg_flags |= KMSG_TRACE_FLAG_CHECKIN;
+
+       if (msg->msgh_bits & MACH_MSGH_BITS_RAISEIMP)
+               msg_flags |= KMSG_TRACE_FLAG_RAISEIMP;
+
+       if (unsafe_convert_port_to_voucher(kmsg->ikm_voucher))
+               msg_flags |= KMSG_TRACE_FLAG_VOUCHER;
+
+       /*
+        * Sending task / port
+        */
+       send_task = current_task();
+       send_pid = task_pid(send_task);
+
+       if (send_pid != 0) {
+               if (task_is_daemon(send_task))
+                       msg_flags |= KMSG_TRACE_FLAG_DAEMON_SRC;
+               else if (task_is_app(send_task))
+                       msg_flags |= KMSG_TRACE_FLAG_APP_SRC;
+       }
+
+       is_task_64bit = (send_task->map->max_offset > VM_MAX_ADDRESS);
+       if (is_task_64bit)
+               msg_flags |= KMSG_TRACE_FLAG_SND64;
+
+       src_port = (ipc_port_t)(msg->msgh_local_port);
+       if (src_port) {
+               if (src_port->ip_messages.imq_qlimit != MACH_PORT_QLIMIT_DEFAULT)
+                       msg_flags |= KMSG_TRACE_FLAG_SRC_NDFLTQ;
+               switch (MACH_MSGH_BITS_LOCAL(msg->msgh_bits)) {
+               case MACH_MSG_TYPE_MOVE_SEND_ONCE:
+                       msg_flags |= KMSG_TRACE_FLAG_SRC_SONCE;
+                       break;
+               default:
+                       break;
+               }
+       } else {
+               msg_flags |= KMSG_TRACE_FLAG_ONEWAY;
+       }
+
+
+       /*
+        * Destination task / port
+        */
+       ip_lock(dst_port);
+       if (!ip_active(dst_port)) {
+               /* dst port is being torn down */
+               dst_pid = (uint32_t)0xfffffff0;
+       } else if (dst_port->ip_tempowner) {
+               msg_flags |= KMSG_TRACE_FLAG_DTMPOWNER;
+               if (IIT_NULL != dst_port->ip_imp_task)
+                       dst_pid = task_pid(dst_port->ip_imp_task->iit_task);
+               else
+                       dst_pid = (uint32_t)0xfffffff1;
+       } else if (dst_port->ip_receiver_name == MACH_PORT_NULL) {
+               /* dst_port is otherwise in-transit */
+               dst_pid = (uint32_t)0xfffffff2;
+       } else {
+               if (dst_port->ip_receiver == ipc_space_kernel) {
+                       dst_pid = 0;
+               } else {
+                       ipc_space_t dst_space;
+                       dst_space = dst_port->ip_receiver;
+                       if (dst_space && is_active(dst_space)) {
+                               dst_pid = task_pid(dst_space->is_task);
+                               if (task_is_daemon(dst_space->is_task))
+                                       msg_flags |= KMSG_TRACE_FLAG_DAEMON_DST;
+                               else if (task_is_app(dst_space->is_task))
+                                       msg_flags |= KMSG_TRACE_FLAG_APP_DST;
+                       } else {
+                               /* receiving task is being torn down */
+                               dst_pid = (uint32_t)0xfffffff3;
+                       }
+               }
+       }
+
+       if (dst_port->ip_messages.imq_qlimit != MACH_PORT_QLIMIT_DEFAULT)
+               msg_flags |= KMSG_TRACE_FLAG_DST_NDFLTQ;
+       if (imq_full(&dst_port->ip_messages))
+               msg_flags |= KMSG_TRACE_FLAG_DSTQFULL;
+
+       kotype = ip_kotype(dst_port);
+
+       ip_unlock(dst_port);
+
+       switch (kotype) {
+       case IKOT_SEMAPHORE:
+               msg_flags |= KMSG_TRACE_FLAG_SEMA;
+               break;
+       case IKOT_TIMER:
+       case IKOT_CLOCK:
+               msg_flags |= KMSG_TRACE_FLAG_TIMER;
+               break;
+       case IKOT_MASTER_DEVICE:
+       case IKOT_IOKIT_CONNECT:
+       case IKOT_IOKIT_OBJECT:
+       case IKOT_IOKIT_IDENT:
+               msg_flags |= KMSG_TRACE_FLAG_IOKIT;
+               break;
+       default:
+               break;
+       }
+
+       switch(MACH_MSGH_BITS_REMOTE(msg->msgh_bits)) {
+       case MACH_MSG_TYPE_PORT_SEND_ONCE:
+               msg_flags |= KMSG_TRACE_FLAG_DST_SONCE;
+               break;
+       default:
+               break;
+       }
+
+
+       /*
+        * Message size / content
+        */
+       msg_size = msg->msgh_size - sizeof(mach_msg_header_t);
+
+       if (msg->msgh_bits & MACH_MSGH_BITS_COMPLEX) {
+               mach_msg_body_t *msg_body;
+               mach_msg_descriptor_t *kern_dsc;
+               int dsc_count;
+
+               msg_flags |= KMSG_TRACE_FLAG_COMPLEX;
+
+               msg_body = (mach_msg_body_t *)(kmsg->ikm_header + 1);
+               dsc_count = (int)msg_body->msgh_descriptor_count;
+               kern_dsc = (mach_msg_descriptor_t *)(msg_body + 1);
+
+               /* this is gross: see ipc_kmsg_copyin_body()... */
+               if (!is_task_64bit)
+                       msg_size -= (dsc_count * 12);
+
+               for (int i = 0; i < dsc_count; i++) {
+                       switch (kern_dsc[i].type.type) {
+                       case MACH_MSG_PORT_DESCRIPTOR:
+                               num_ports++;
+                               if (is_task_64bit)
+                                       msg_size -= 12;
+                               break;
+                       case MACH_MSG_OOL_VOLATILE_DESCRIPTOR:
+                       case MACH_MSG_OOL_DESCRIPTOR: {
+                               mach_msg_ool_descriptor_t *dsc;
+                               dsc = (mach_msg_ool_descriptor_t *)&kern_dsc[i];
+                               msg_flags |= KMSG_TRACE_FLAG_OOLMEM;
+                               msg_size += dsc->size;
+                               if ((dsc->size >= MSG_OOL_SIZE_SMALL) &&
+                                   (dsc->copy == MACH_MSG_PHYSICAL_COPY) &&
+                                   !dsc->deallocate)
+                                       msg_flags |= KMSG_TRACE_FLAG_PCPY;
+                               else if (dsc->size <= MSG_OOL_SIZE_SMALL)
+                                       msg_flags |= KMSG_TRACE_FLAG_PCPY;
+                               else
+                                       msg_flags |= KMSG_TRACE_FLAG_VCPY;
+                               if (is_task_64bit)
+                                       msg_size -= 16;
+                               } break;
+                       case MACH_MSG_OOL_PORTS_DESCRIPTOR: {
+                               mach_msg_ool_ports_descriptor_t *dsc;
+                               dsc = (mach_msg_ool_ports_descriptor_t *)&kern_dsc[i];
+                               num_ports += dsc->count;
+                               if (is_task_64bit)
+                                       msg_size -= 16;
+                               } break;
+                       default:
+                               break;
+                       }
+               }
+       }
+
+       /*
+        * Trailer contents
+        */
+       trailer = (mach_msg_trailer_t *)((vm_offset_t)msg +
+                                        (vm_offset_t)msg->msgh_size);
+       if (trailer->msgh_trailer_size <= sizeof(mach_msg_security_trailer_t)) {
+               extern security_token_t KERNEL_SECURITY_TOKEN;
+               mach_msg_security_trailer_t *strailer;
+               strailer = (mach_msg_security_trailer_t *)trailer;
+               /*
+                * verify the sender PID: replies from the kernel often look
+                * like self-talk because the sending port is not reset.
+                */
+               if (memcmp(&strailer->msgh_sender,
+                          &KERNEL_SECURITY_TOKEN,
+                          sizeof(KERNEL_SECURITY_TOKEN)) == 0) {
+                       send_pid = 0;
+                       msg_flags &= ~(KMSG_TRACE_FLAG_APP_SRC | KMSG_TRACE_FLAG_DAEMON_SRC);
+               }
+       }
+
+       KDBG(MACHDBG_CODE(DBG_MACH_IPC,MACH_IPC_KMSG_INFO) | DBG_FUNC_END,
+                (uintptr_t)send_pid,
+                (uintptr_t)dst_pid,
+                (uintptr_t)msg_size,
+                (uintptr_t)(
+                  ((msg_flags & KMSG_TRACE_FLAGS_MASK) << KMSG_TRACE_FLAGS_SHIFT) |
+                  ((num_ports & KMSG_TRACE_PORTS_MASK) << KMSG_TRACE_PORTS_SHIFT)
+                )
+       );
+}
+#endif
+
 /* zone for cached ipc_kmsg_t structures */
 zone_t                 ipc_kmsg_zone;
 
@@ -565,6 +853,8 @@ mach_msg_return_t ipc_kmsg_copyin_body(
        ipc_space_t             space,
        vm_map_t                map);
 
+extern int thread_qos_from_pthread_priority(unsigned long, unsigned long *);
+
 /*
  *     We keep a per-processor cache of kernel message buffers.
  *     The cache saves the overhead/locking of using kalloc/kfree.
@@ -730,7 +1020,100 @@ ipc_kmsg_enqueue(
        ipc_kmsg_queue_t        queue,
        ipc_kmsg_t              kmsg)
 {
-       ipc_kmsg_enqueue_macro(queue, kmsg);
+       ipc_kmsg_t first = queue->ikmq_base;
+       ipc_kmsg_t last;
+
+       if (first == IKM_NULL) {
+               queue->ikmq_base = kmsg;
+               kmsg->ikm_next = kmsg;
+               kmsg->ikm_prev = kmsg;
+       } else {
+               last = first->ikm_prev;
+               kmsg->ikm_next = first;
+               kmsg->ikm_prev = last;
+               first->ikm_prev = kmsg;
+               last->ikm_next = kmsg;
+       }
+}
+
+/*
+ *     Routine:        ipc_kmsg_enqueue_qos
+ *     Purpose:
+ *             Enqueue a kmsg, propagating qos
+ *             overrides towards the head of the queue.
+ *
+ *     Returns:
+ *             whether the head of the queue had
+ *             it's override-qos adjusted because
+ *             of this insertion.
+ */
+
+boolean_t
+ipc_kmsg_enqueue_qos(
+       ipc_kmsg_queue_t        queue,
+       ipc_kmsg_t              kmsg)
+{
+       ipc_kmsg_t first = queue->ikmq_base;
+       ipc_kmsg_t prev;
+       mach_msg_priority_t override;
+
+       if (first == IKM_NULL) {
+               /* insert a first message */
+               queue->ikmq_base = kmsg;
+               kmsg->ikm_next = kmsg;
+               kmsg->ikm_prev = kmsg;
+               return TRUE;
+       }
+
+       /* insert at the tail */
+       prev = first->ikm_prev;
+       kmsg->ikm_next = first;
+       kmsg->ikm_prev = prev;
+       first->ikm_prev = kmsg;
+       prev->ikm_next = kmsg;
+
+       /* apply QoS overrides towards the head */
+       override = kmsg->ikm_qos_override;
+       while (prev != kmsg &&
+              override > prev->ikm_qos_override) {
+               prev->ikm_qos_override = override;
+               prev = prev->ikm_prev;
+       }
+
+       /* did we adjust everything? */
+       return (prev == kmsg);
+}
+
+/*
+ *     Routine:        ipc_kmsg_override_qos
+ *     Purpose:
+ *             Update the override for a given kmsg already
+ *             enqueued, propagating qos override adjustments
+ *             towards the head of the queue.
+ *
+ *     Returns:
+ *             whether the head of the queue had
+ *             it's override-qos adjusted because
+ *             of this insertion.
+ */
+
+boolean_t
+ipc_kmsg_override_qos(
+       ipc_kmsg_queue_t        queue,
+       ipc_kmsg_t          kmsg,
+       mach_msg_priority_t override)
+{
+       ipc_kmsg_t first = queue->ikmq_base;
+       ipc_kmsg_t cur = kmsg;
+
+       /* apply QoS overrides towards the head */
+       while (override > cur->ikm_qos_override) {
+               cur->ikm_qos_override = override;
+               if (cur == first)
+                       return TRUE;
+                cur = cur->ikm_prev;
+       }
+       return FALSE;
 }
 
 /*
@@ -748,7 +1131,7 @@ ipc_kmsg_dequeue(
        first = ipc_kmsg_queue_first(queue);
 
        if (first != IKM_NULL)
-               ipc_kmsg_rmqueue_first_macro(queue, first);
+               ipc_kmsg_rmqueue(queue, first);
 
        return first;
 }
@@ -777,6 +1160,12 @@ ipc_kmsg_rmqueue(
 
                queue->ikmq_base = IKM_NULL;
        } else {
+               if (__improbable(next->ikm_prev != kmsg || prev->ikm_next != kmsg)) {
+                       panic("ipc_kmsg_rmqueue: inconsistent prev/next pointers. "
+                               "(prev->next: %p, next->prev: %p, kmsg: %p)",
+                               prev->ikm_next, next->ikm_prev, kmsg);
+               }
+
                if (queue->ikmq_base == kmsg)
                        queue->ikmq_base = next;
 
@@ -1083,7 +1472,16 @@ ipc_kmsg_set_prealloc(
        assert(kmsg->ikm_prealloc == IP_NULL);
   
        kmsg->ikm_prealloc = IP_NULL;
+       /* take the mqueue lock since the sync qos is protected under it */
+       imq_lock(&port->ip_messages);
+
+       /* copy the sync qos values to kmsg */
+       for (int i = 0; i < THREAD_QOS_LAST; i++) {
+               kmsg->sync_qos[i] = port_sync_qos(port, i);
+       }
+       kmsg->special_port_qos = port_special_qos(port);
        IP_SET_PREALLOC(port, kmsg);
+       imq_unlock(&port->ip_messages);
 }
 
 /*
@@ -1101,7 +1499,18 @@ ipc_kmsg_clear_prealloc(
        assert(kmsg->ikm_prealloc == port);
   
        kmsg->ikm_prealloc = IP_NULL;
+
+       /* take the mqueue lock since the sync qos is protected under it */
+       imq_lock(&port->ip_messages);
+
        IP_CLEAR_PREALLOC(port, kmsg);
+
+       /* copy the sync qos values from kmsg to port */
+       for (int i = 0; i < THREAD_QOS_LAST; i++) {
+               set_port_sync_qos(port, i, kmsg->sync_qos[i]);
+       }
+       set_port_special_qos(port, kmsg->special_port_qos);
+       imq_unlock(&port->ip_messages);
 }
 
 /*
@@ -1166,6 +1575,14 @@ ipc_kmsg_get(
        if (copyinmsg(msg_addr, (char *)&legacy_base, len_copied))
                return MACH_SEND_INVALID_DATA;
 
+       /*
+        * If the message claims to be complex, it must at least
+        * have the length of a "base" message (header + dsc_count).
+        */
+       if (len_copied < sizeof(mach_msg_legacy_base_t) &&
+           (legacy_base.header.msgh_bits & MACH_MSGH_BITS_COMPLEX))
+               return MACH_SEND_MSG_TOO_SMALL;
+
        msg_addr += sizeof(legacy_base.header);
 #if defined(__LP64__)
        size += LEGACY_HEADER_SIZE_DELTA;
@@ -1325,6 +1742,8 @@ ipc_kmsg_get_from_kernel(
 
        (void) memcpy((void *) kmsg->ikm_header, (const void *) msg, size);
 
+       ikm_qos_init(kmsg);
+
        kmsg->ikm_header->msgh_size = size;
 
        /* 
@@ -1376,7 +1795,6 @@ ipc_kmsg_send(
        thread_t th = current_thread();
        mach_msg_return_t error = MACH_MSG_SUCCESS;
        boolean_t kernel_reply = FALSE;
-       spl_t s;
 
        /* Check if honor qlimit flag is set on thread. */
        if ((th->options & TH_OPT_HONOR_QLIMIT) == TH_OPT_HONOR_QLIMIT) {
@@ -1389,18 +1807,21 @@ ipc_kmsg_send(
 
 #if IMPORTANCE_INHERITANCE
        boolean_t did_importance = FALSE;
-#if IMPORTANCE_DEBUG
+#if IMPORTANCE_TRACE
        mach_msg_id_t imp_msgh_id = -1;
        int           sender_pid  = -1;
-#endif /* IMPORTANCE_DEBUG */
+#endif /* IMPORTANCE_TRACE */
 #endif /* IMPORTANCE_INHERITANCE */
 
        /* don't allow the creation of a circular loop */
        if (kmsg->ikm_header->msgh_bits & MACH_MSGH_BITS_CIRCULAR) {
                ipc_kmsg_destroy(kmsg);
+               KDBG(MACHDBG_CODE(DBG_MACH_IPC,MACH_IPC_KMSG_INFO) | DBG_FUNC_END, MACH_MSGH_BITS_CIRCULAR);
                return MACH_MSG_SUCCESS;
        }
 
+       ipc_voucher_send_preprocessing(kmsg);
+
        port = (ipc_port_t) kmsg->ikm_header->msgh_remote_port;
        assert(IP_VALID(port));
        ip_lock(port);
@@ -1415,9 +1836,14 @@ retry:
         */
        if (!ip_active(port)) {
                ip_unlock(port);
+#if MACH_FLIPC
+        if (MACH_NODE_VALID(kmsg->ikm_node) && FPORT_VALID(port->ip_messages.imq_fport))
+            flipc_msg_ack(kmsg->ikm_node, &port->ip_messages, FALSE);
+#endif
                ip_release(port);  /* JMM - Future: release right, not just ref */
                kmsg->ikm_header->msgh_remote_port = MACH_PORT_NULL;
                ipc_kmsg_destroy(kmsg);
+               KDBG(MACHDBG_CODE(DBG_MACH_IPC,MACH_IPC_KMSG_INFO) | DBG_FUNC_END, MACH_SEND_INVALID_DEST);
                return MACH_MSG_SUCCESS;
        }
 
@@ -1438,15 +1864,19 @@ retry:
                /*
                 * Call the server routine, and get the reply message to send.
                 */
-               kmsg = ipc_kobject_server(kmsg);
+               kmsg = ipc_kobject_server(kmsg, option);
                if (kmsg == IKM_NULL)
                        return MACH_MSG_SUCCESS;
 
+               /* restart the KMSG_INFO tracing for the reply message */
+               KDBG(MACHDBG_CODE(DBG_MACH_IPC,MACH_IPC_KMSG_INFO) | DBG_FUNC_START);
                port = (ipc_port_t) kmsg->ikm_header->msgh_remote_port;
                assert(IP_VALID(port));
                ip_lock(port);
                /* fall thru with reply - same options */
                kernel_reply = TRUE;
+               if (!ip_active(port))
+                       error = MACH_SEND_INVALID_DEST;
        }
 
 #if IMPORTANCE_INHERITANCE
@@ -1462,17 +1892,20 @@ retry:
        }
 #endif /* IMPORTANCE_INHERITANCE */
 
-       /*
-        * We have a valid message and a valid reference on the port.
-        * we can unlock the port and call mqueue_send() on its message
-        * queue. Lock message queue while port is locked.
-        */
-       s = splsched();
-       imq_lock(&port->ip_messages);
-       ip_unlock(port);
+       if (error != MACH_MSG_SUCCESS) {
+               ip_unlock(port);
+       } else {
+               /*
+                * We have a valid message and a valid reference on the port.
+                * we can unlock the port and call mqueue_send() on its message
+                * queue. Lock message queue while port is locked.
+                */
+               imq_lock(&port->ip_messages);
+               ip_unlock(port);
 
-       error = ipc_mqueue_send(&port->ip_messages, kmsg, option, 
-                       send_timeout, s);
+               error = ipc_mqueue_send(&port->ip_messages, kmsg, option,
+                               send_timeout);
+       }
 
 #if IMPORTANCE_INHERITANCE
        if (did_importance == TRUE) {
@@ -1505,10 +1938,10 @@ retry:
                        default:
                                break;
                }
-#if IMPORTANCE_DEBUG
+#if IMPORTANCE_TRACE
                KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE, (IMPORTANCE_CODE(IMP_MSG, IMP_MSG_SEND)) | DBG_FUNC_END,
                                          task_pid(current_task()), sender_pid, imp_msgh_id, importance_cleared, 0);
-#endif /* IMPORTANCE_DEBUG */
+#endif /* IMPORTANCE_TRACE */
        }
 #endif /* IMPORTANCE_INHERITANCE */
 
@@ -1517,9 +1950,14 @@ retry:
         * as a successful delivery (like we do for an inactive port).
         */
        if (error == MACH_SEND_INVALID_DEST) {
+#if MACH_FLIPC
+        if (MACH_NODE_VALID(kmsg->ikm_node) && FPORT_VALID(port->ip_messages.imq_fport))
+            flipc_msg_ack(kmsg->ikm_node, &port->ip_messages, FALSE);
+#endif
                ip_release(port); /* JMM - Future: release right, not just ref */
                kmsg->ikm_header->msgh_remote_port = MACH_PORT_NULL;
                ipc_kmsg_destroy(kmsg);
+               KDBG(MACHDBG_CODE(DBG_MACH_IPC,MACH_IPC_KMSG_INFO) | DBG_FUNC_END, MACH_SEND_INVALID_DEST);
                return MACH_MSG_SUCCESS;
        }
 
@@ -1529,9 +1967,14 @@ retry:
                 * pseudo-receive on error conditions. We need to just treat
                 * the message as a successful delivery.
                 */
+#if MACH_FLIPC
+        if (MACH_NODE_VALID(kmsg->ikm_node) && FPORT_VALID(port->ip_messages.imq_fport))
+            flipc_msg_ack(kmsg->ikm_node, &port->ip_messages, FALSE);
+#endif
                ip_release(port); /* JMM - Future: release right, not just ref */
                kmsg->ikm_header->msgh_remote_port = MACH_PORT_NULL;
                ipc_kmsg_destroy(kmsg);
+               KDBG(MACHDBG_CODE(DBG_MACH_IPC,MACH_IPC_KMSG_INFO) | DBG_FUNC_END, error);
                return MACH_MSG_SUCCESS;
        }
        return error;
@@ -1553,10 +1996,14 @@ retry:
 
 mach_msg_return_t
 ipc_kmsg_put(
-       mach_vm_address_t       msg_addr,
        ipc_kmsg_t              kmsg,
-       mach_msg_size_t         size)
+       mach_msg_option_t       option,
+       mach_vm_address_t       rcv_addr,
+       mach_msg_size_t         rcv_size,
+       mach_msg_size_t         trailer_size,
+       mach_msg_size_t         *sizep)
 {
+       mach_msg_size_t size = kmsg->ikm_header->msgh_size + trailer_size;
        mach_msg_return_t mr;
 
        DEBUG_IPC_KMSG_PRINT(kmsg, "ipc_kmsg_put()");
@@ -1612,12 +2059,29 @@ ipc_kmsg_put(
                kprintf("type: %d\n", ((mach_msg_type_descriptor_t *)(((mach_msg_base_t *)kmsg->ikm_header)+1))->type);
        }
        __unreachable_ok_pop
-       if (copyoutmsg((const char *) kmsg->ikm_header, msg_addr, size))
+
+        /* Re-Compute target address if using stack-style delivery */
+       if (option & MACH_RCV_STACK) {
+               rcv_addr += rcv_size - size;
+       }
+
+       if (copyoutmsg((const char *) kmsg->ikm_header, rcv_addr, size)) {
                mr = MACH_RCV_INVALID_DATA;
-       else
+               size = 0;
+       } else
                mr = MACH_MSG_SUCCESS;
 
+       KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_IPC,MACH_IPC_KMSG_LINK) | DBG_FUNC_NONE,
+                             (rcv_addr >= VM_MIN_KERNEL_AND_KEXT_ADDRESS ||
+                              rcv_addr + size >= VM_MIN_KERNEL_AND_KEXT_ADDRESS) ? (uintptr_t)0 : (uintptr_t)rcv_addr,
+                             VM_KERNEL_ADDRPERM((uintptr_t)kmsg),
+                             1 /* this is on the receive/copyout path */,
+                             0,
+                             0);
        ipc_kmsg_free(kmsg);
+
+       if (sizep)
+               *sizep = size;
        return mr;
 }
 
@@ -1642,6 +2106,55 @@ ipc_kmsg_put_to_kernel(
        ipc_kmsg_free(kmsg);
 }
 
+unsigned long pthread_priority_canonicalize(unsigned long priority, boolean_t propagation);
+
+static kern_return_t
+ipc_kmsg_set_qos(
+       ipc_kmsg_t kmsg,
+       mach_msg_option_t options,
+       mach_msg_priority_t override)
+{
+       kern_return_t kr;
+       unsigned long flags = 0;
+       ipc_port_t special_reply_port = kmsg->ikm_header->msgh_local_port;
+       ipc_port_t dest_port = kmsg->ikm_header->msgh_remote_port;
+
+       kr = ipc_get_pthpriority_from_kmsg_voucher(kmsg, &kmsg->ikm_qos);
+       if (kr != KERN_SUCCESS) {
+               kmsg->ikm_qos = MACH_MSG_PRIORITY_UNSPECIFIED;
+       }
+       kmsg->ikm_qos_override = kmsg->ikm_qos;
+
+       if (options & MACH_SEND_OVERRIDE) {
+               unsigned long canonical;
+               mach_msg_priority_t canon;
+
+               canonical = pthread_priority_canonicalize(override, TRUE);
+               canon = (mach_msg_priority_t)canonical;
+               if (canon > kmsg->ikm_qos)
+                       kmsg->ikm_qos_override = canon;
+       }
+
+       kr = KERN_SUCCESS;
+       if ((options & MACH_SEND_SYNC_OVERRIDE)) {
+               if (IP_VALID(special_reply_port) &&
+                   MACH_MSGH_BITS_LOCAL(kmsg->ikm_header->msgh_bits) == MACH_MSG_TYPE_PORT_SEND_ONCE) {
+                       /*
+                        * Update the sync override count if the reply port is a special reply port,
+                        * link the destination port to special reply port and update the qos count
+                        * of destination port.
+                        *
+                        * Use the qos value passed by voucher and not the one passed by notify field.
+                        */
+                       kr = ipc_port_link_special_reply_port_with_qos(special_reply_port, dest_port,
+                               thread_qos_from_pthread_priority(kmsg->ikm_qos, &flags));
+               } else {
+                       kr = KERN_FAILURE;
+               }
+       }
+       return kr;
+}
+
 /*
  *     Routine:        ipc_kmsg_copyin_header
  *     Purpose:
@@ -1670,6 +2183,7 @@ mach_msg_return_t
 ipc_kmsg_copyin_header(
        ipc_kmsg_t              kmsg,
        ipc_space_t             space,
+       mach_msg_priority_t override,
        mach_msg_option_t       *optionp)
 {
        mach_msg_header_t *msg = kmsg->ikm_header;
@@ -1955,33 +2469,42 @@ ipc_kmsg_copyin_header(
                }
        }
 
-       /* the entry(s) might need to be deallocated */
+       /*
+        * The entries might need to be deallocated.
+        *
+        * Each entry should be deallocated only once,
+        * even if it was specified in more than one slot in the header.
+        * Note that dest can be the same entry as reply or voucher,
+        * but reply and voucher must be distinct entries.
+        */
        assert(IE_NULL != dest_entry);
+       if (IE_NULL != reply_entry)
+               assert(reply_entry != voucher_entry);
+
        if (IE_BITS_TYPE(dest_entry->ie_bits) == MACH_PORT_TYPE_NONE) {
                ipc_entry_dealloc(space, dest_name, dest_entry);
+
+               if (dest_entry == reply_entry) {
+                       reply_entry = IE_NULL;
+               }
+
+               if (dest_entry == voucher_entry) {
+                       voucher_entry = IE_NULL;
+               }
+
                dest_entry = IE_NULL;
        }
-       if (dest_entry != reply_entry && IE_NULL != reply_entry &&
+       if (IE_NULL != reply_entry &&
            IE_BITS_TYPE(reply_entry->ie_bits) == MACH_PORT_TYPE_NONE) {
                ipc_entry_dealloc(space, reply_name, reply_entry);
                reply_entry = IE_NULL;
        }
-       if (dest_entry != voucher_entry && IE_NULL != voucher_entry &&
+       if (IE_NULL != voucher_entry &&
            IE_BITS_TYPE(voucher_entry->ie_bits) == MACH_PORT_TYPE_NONE) {
                ipc_entry_dealloc(space, voucher_name, voucher_entry);
                voucher_entry = IE_NULL;
        }
 
-       /*
-        * No room to store voucher port in in-kernel msg header,
-        * so we store it back in the kmsg itself.
-        */
-       if (IP_VALID(voucher_port)) {
-               assert(ip_active(voucher_port));
-               kmsg->ikm_voucher = voucher_port;
-               voucher_type = MACH_MSG_TYPE_MOVE_SEND;
-       }
-
        dest_type = ipc_object_copyin_type(dest_type);
        reply_type = ipc_object_copyin_type(reply_type);
 
@@ -2002,12 +2525,16 @@ ipc_kmsg_copyin_header(
                        if (ip_full(dport)) {
 #if IMPORTANCE_INHERITANCE
                                needboost = ipc_port_request_sparm(dport, dest_name, 
-                                                       dest_entry->ie_request,
-                                                       (*optionp & MACH_SEND_NOIMPORTANCE));
+                                                                  dest_entry->ie_request,
+                                                                  *optionp,
+                                                                  override);
                                if (needboost == FALSE)
                                        ip_unlock(dport);
 #else
-                               ipc_port_request_sparm(dport, dest_name, dest_entry->ie_request);
+                               ipc_port_request_sparm(dport, dest_name,
+                                                      dest_entry->ie_request,
+                                                      *optionp,
+                                                                          override);
                                ip_unlock(dport);
 #endif /* IMPORTANCE_INHERITANCE */
                        } else {
@@ -2046,10 +2573,25 @@ ipc_kmsg_copyin_header(
        if (voucher_soright != IP_NULL) {
                ipc_notify_port_deleted(voucher_soright, voucher_name);
        }
+
+       /*
+        * No room to store voucher port in in-kernel msg header,
+        * so we store it back in the kmsg itself.  Extract the
+        * qos, and apply any override before we enqueue the kmsg.
+        */
+       if (IP_VALID(voucher_port)) {
+
+               kmsg->ikm_voucher = voucher_port;
+               voucher_type = MACH_MSG_TYPE_MOVE_SEND;
+       }
+
        msg->msgh_bits = MACH_MSGH_BITS_SET(dest_type, reply_type, voucher_type, mbits);
        msg->msgh_remote_port = (ipc_port_t)dest_port;
        msg->msgh_local_port = (ipc_port_t)reply_port;
 
+       /* capture the qos value(s) for the kmsg */
+       ipc_kmsg_set_qos(kmsg, *optionp, override);
+
        if (release_port != IP_NULL)
                ip_release(release_port);
 
@@ -2316,14 +2858,24 @@ ipc_kmsg_copyin_ool_ports_descriptor(
     result_disp = ipc_object_copyin_type(user_disp);
     dsc->disposition = result_disp;
 
-    if (count > (INT_MAX / sizeof(mach_port_t))) {
-        *mr = MACH_SEND_TOO_LARGE;
+    /* We always do a 'physical copy', but you have to specify something valid */
+    if (copy_option != MACH_MSG_PHYSICAL_COPY &&
+        copy_option != MACH_MSG_VIRTUAL_COPY) {
+        *mr = MACH_SEND_INVALID_TYPE;
         return NULL;
     }
 
     /* calculate length of data in bytes, rounding up */
-    ports_length = count * sizeof(mach_port_t);
-    names_length = count * sizeof(mach_port_name_t);
+
+    if (os_mul_overflow(count, sizeof(mach_port_t), &ports_length)) {
+        *mr = MACH_SEND_TOO_LARGE;
+        return NULL;
+    }
+
+    if (os_mul_overflow(count, sizeof(mach_port_name_t), &names_length)) {
+        *mr = MACH_SEND_TOO_LARGE;
+        return NULL;
+    }
 
     if (ports_length == 0) {
         return user_dsc;
@@ -2435,6 +2987,8 @@ ipc_kmsg_copyin_body(
 
     vm_size_t           descriptor_size = 0;
 
+    mach_msg_type_number_t total_ool_port_count = 0;
+
     /*
      * Determine if the target is a kernel port.
      */
@@ -2454,6 +3008,7 @@ ipc_kmsg_copyin_body(
     daddr = NULL;
     for (i = 0; i < dsc_count; i++) {
        mach_msg_size_t size;
+       mach_msg_type_number_t ool_port_count = 0;
 
        daddr = naddr;
 
@@ -2478,9 +3033,8 @@ ipc_kmsg_copyin_body(
 
        if (naddr > (mach_msg_descriptor_t *)
            ((vm_offset_t)kmsg->ikm_header + kmsg->ikm_header->msgh_size)) {
-           ipc_kmsg_clean_partial(kmsg, 0, NULL, 0, 0);
-           mr = MACH_SEND_MSG_TOO_SMALL;
-           goto out;
+               mr = MACH_SEND_MSG_TOO_SMALL;
+               goto clean_message;
        }
 
        switch (daddr->type.type) {
@@ -2495,11 +3049,10 @@ ipc_kmsg_copyin_body(
                /*
                 * Invalid copy option
                 */
-               ipc_kmsg_clean_partial(kmsg, 0, NULL, 0, 0);
                mr = MACH_SEND_INVALID_TYPE;
-               goto out;
+               goto clean_message;
            }
-           
+
            if ((size >= MSG_OOL_SIZE_SMALL) &&
                (daddr->out_of_line.copy == MACH_MSG_PHYSICAL_COPY) &&
                !(daddr->out_of_line.deallocate)) {
@@ -2509,37 +3062,62 @@ ipc_kmsg_copyin_body(
                 * memory requirements
                 */
                if (space_needed + round_page(size) <= space_needed) {
-                   /* Overflow dectected */
-                   ipc_kmsg_clean_partial(kmsg, 0, NULL, 0, 0);
-                   mr = MACH_MSG_VM_KERNEL;
-                   goto out;
-               }                   
-                   
+                       /* Overflow dectected */
+                       mr = MACH_MSG_VM_KERNEL;
+                       goto clean_message;
+               }
+
                space_needed += round_page(size);
                if (space_needed > ipc_kmsg_max_vm_space) {
-                   
-                   /*
-                    * Per message kernel memory limit exceeded
-                    */
-                   ipc_kmsg_clean_partial(kmsg, 0, NULL, 0, 0);
+                   /* Per message kernel memory limit exceeded */
                    mr = MACH_MSG_VM_KERNEL;
-                   goto out;
+                   goto clean_message;
                }
            }
+           break;
+       case MACH_MSG_PORT_DESCRIPTOR:
+               if (os_add_overflow(total_ool_port_count, 1, &total_ool_port_count)) {
+                       /* Overflow detected */
+                       mr = MACH_SEND_TOO_LARGE;
+                       goto clean_message;
+               }
+               break;
+       case MACH_MSG_OOL_PORTS_DESCRIPTOR:
+               ool_port_count = (is_task_64bit) ?
+                       ((mach_msg_ool_ports_descriptor64_t *)daddr)->count :
+                       daddr->ool_ports.count;
+
+               if (os_add_overflow(total_ool_port_count, ool_port_count, &total_ool_port_count)) {
+                       /* Overflow detected */
+                       mr = MACH_SEND_TOO_LARGE;
+                       goto clean_message;
+               }
+
+               if (ool_port_count > (ipc_kmsg_max_vm_space/sizeof(mach_port_t))) {
+                       /* Per message kernel memory limit exceeded */
+                       mr = MACH_SEND_TOO_LARGE;
+                       goto clean_message;
+               }
+               break;
        }
     }
 
+       /* Sending more than 16383 rights in one message seems crazy */
+       if (total_ool_port_count >= (MACH_PORT_UREFS_MAX / 4)) {
+               mr = MACH_SEND_TOO_LARGE;
+               goto clean_message;
+       }
+
     /*
      * Allocate space in the pageable kernel ipc copy map for all the
      * ool data that is to be physically copied.  Map is marked wait for
      * space.
      */
     if (space_needed) {
-        if (vm_allocate(ipc_kernel_copy_map, &paddr, space_needed, 
-                    VM_FLAGS_ANYWHERE | VM_MAKE_TAG(VM_KERN_MEMORY_IPC)) != KERN_SUCCESS) {
-            ipc_kmsg_clean_partial(kmsg, 0, NULL, 0, 0);
+        if (vm_allocate_kernel(ipc_kernel_copy_map, &paddr, space_needed,
+                    VM_FLAGS_ANYWHERE, VM_KERN_MEMORY_IPC) != KERN_SUCCESS) {
             mr = MACH_MSG_VM_KERNEL;
-            goto out;
+            goto clean_message;
         }
     }
 
@@ -2603,6 +3181,11 @@ ipc_kmsg_copyin_body(
     }
  out:
     return mr;
+
+clean_message:
+       /* no descriptors have been copied in yet */
+       ipc_kmsg_clean_partial(kmsg, 0, NULL, 0, 0);
+       return mr;
 }
 
 
@@ -2635,13 +3218,14 @@ ipc_kmsg_copyin(
        ipc_kmsg_t              kmsg,
        ipc_space_t             space,
        vm_map_t                map,
+       mach_msg_priority_t override,
        mach_msg_option_t       *optionp)
 {
     mach_msg_return_t          mr;
 
     kmsg->ikm_header->msgh_bits &= MACH_MSGH_BITS_USER;
 
-    mr = ipc_kmsg_copyin_header(kmsg, space, optionp);
+    mr = ipc_kmsg_copyin_header(kmsg, space, override, optionp);
 
     if (mr != MACH_MSG_SUCCESS)
        return mr;
@@ -3414,6 +3998,7 @@ ipc_kmsg_copyout_port_descriptor(mach_msg_descriptor_t *dsc,
     {
         mach_msg_port_descriptor_t *user_dsc = (typeof(user_dsc))dest_dsc;
         user_dsc--; // point to the start of this port descriptor
+        bzero((void *)user_dsc, sizeof(*user_dsc));
         user_dsc->name = CAST_MACH_NAME_TO_PORT(name);
         user_dsc->disposition = disp;
         user_dsc->type = MACH_MSG_PORT_DESCRIPTOR;
@@ -3421,6 +4006,7 @@ ipc_kmsg_copyout_port_descriptor(mach_msg_descriptor_t *dsc,
     } else {
         mach_msg_legacy_port_descriptor_t *user_dsc = (typeof(user_dsc))dest_dsc;
         user_dsc--; // point to the start of this port descriptor
+        bzero((void *)user_dsc, sizeof(*user_dsc));
         user_dsc->name = CAST_MACH_PORT_TO_NAME(name);
         user_dsc->disposition = disp;
         user_dsc->type = MACH_MSG_PORT_DESCRIPTOR;
@@ -3438,13 +4024,13 @@ ipc_kmsg_copyout_ool_descriptor(mach_msg_ool_descriptor_t *dsc, mach_msg_descrip
     vm_map_copy_t                      copy;
     vm_map_address_t                   rcv_addr;
     mach_msg_copy_options_t            copy_options;
-    mach_msg_size_t                    size;
+    vm_map_size_t                      size;
     mach_msg_descriptor_type_t dsc_type;
 
     //SKIP_PORT_DESCRIPTORS(saddr, sdsc_count);
 
-    copy = (vm_map_copy_t) dsc->address;
-    size = dsc->size;
+    copy = (vm_map_copy_t)dsc->address;
+    size = (vm_map_size_t)dsc->size;
     copy_options = dsc->copy;
     assert(copy_options != MACH_MSG_KALLOC_COPY_T);
     dsc_type = dsc->type;
@@ -3453,10 +4039,10 @@ ipc_kmsg_copyout_ool_descriptor(mach_msg_ool_descriptor_t *dsc, mach_msg_descrip
        kern_return_t kr;
 
         rcv_addr = 0;
-       if (vm_map_copy_validate_size(map, copy, (vm_map_size_t)size) == FALSE)
+       if (vm_map_copy_validate_size(map, copy, &size) == FALSE)
                panic("Inconsistent OOL/copyout size on %p: expected %d, got %lld @%p",
-                     dsc, size, (unsigned long long)copy->size, copy);
-        kr = vm_map_copyout(map, &rcv_addr, copy);
+                     dsc, dsc->size, (unsigned long long)copy->size, copy);
+        kr = vm_map_copyout_size(map, &rcv_addr, copy, size);
         if (kr != KERN_SUCCESS) {
             if (kr == KERN_RESOURCE_SHORTAGE)
                 *mr |= MACH_MSG_VM_KERNEL;
@@ -3481,33 +4067,36 @@ ipc_kmsg_copyout_ool_descriptor(mach_msg_ool_descriptor_t *dsc, mach_msg_descrip
     {
         mach_msg_ool_descriptor_t *user_ool_dsc = (typeof(user_ool_dsc))user_dsc;
         user_ool_dsc--;
+        bzero((void *)user_ool_dsc, sizeof(*user_ool_dsc));
 
         user_ool_dsc->address = (void *)(uintptr_t)rcv_addr;
         user_ool_dsc->deallocate = (copy_options == MACH_MSG_VIRTUAL_COPY) ?
             TRUE : FALSE;
         user_ool_dsc->copy = copy_options;
         user_ool_dsc->type = dsc_type;
-        user_ool_dsc->size = size;
+        user_ool_dsc->size = (mach_msg_size_t)size;
 
         user_dsc = (typeof(user_dsc))user_ool_dsc;
     } else if (is_64bit) {
         mach_msg_ool_descriptor64_t *user_ool_dsc = (typeof(user_ool_dsc))user_dsc;
         user_ool_dsc--;
+        bzero((void *)user_ool_dsc, sizeof(*user_ool_dsc));
 
         user_ool_dsc->address = rcv_addr;
         user_ool_dsc->deallocate = (copy_options == MACH_MSG_VIRTUAL_COPY) ?
             TRUE : FALSE;
         user_ool_dsc->copy = copy_options;
         user_ool_dsc->type = dsc_type;
-        user_ool_dsc->size = size;
+        user_ool_dsc->size = (mach_msg_size_t)size;
 
         user_dsc = (typeof(user_dsc))user_ool_dsc;
     } else {
         mach_msg_ool_descriptor32_t *user_ool_dsc = (typeof(user_ool_dsc))user_dsc;
         user_ool_dsc--;
+        bzero((void *)user_ool_dsc, sizeof(*user_ool_dsc));
 
         user_ool_dsc->address = CAST_DOWN_EXPLICIT(uint32_t, rcv_addr);
-        user_ool_dsc->size = size;
+        user_ool_dsc->size = (mach_msg_size_t)size;
         user_ool_dsc->deallocate = (copy_options == MACH_MSG_VIRTUAL_COPY) ?
             TRUE : FALSE;
         user_ool_dsc->copy = copy_options;
@@ -3579,14 +4168,14 @@ ipc_kmsg_copyout_ool_ports_descriptor(mach_msg_ool_ports_descriptor_t *dsc,
             /*
              * Dynamically allocate the region
              */
-            int anywhere = VM_FLAGS_ANYWHERE;
-           if (vm_kernel_map_is_kernel(map)) anywhere |= VM_MAKE_TAG(VM_KERN_MEMORY_IPC);
-           else                              anywhere |= VM_MAKE_TAG(VM_MEMORY_MACH_MSG);
+            vm_tag_t tag;
+           if (vm_kernel_map_is_kernel(map)) tag = VM_KERN_MEMORY_IPC;
+           else                              tag = VM_MEMORY_MACH_MSG;
 
             kern_return_t kr;
-            if ((kr = mach_vm_allocate(map, &rcv_addr, 
+            if ((kr = mach_vm_allocate_kernel(map, &rcv_addr,
                             (mach_vm_size_t)names_length,
-                            anywhere)) != KERN_SUCCESS) {
+                            VM_FLAGS_ANYWHERE, tag)) != KERN_SUCCESS) {
                 ipc_kmsg_clean_body(kmsg, 1, (mach_msg_descriptor_t *)dsc);
                 rcv_addr = 0;
 
@@ -3632,6 +4221,7 @@ ipc_kmsg_copyout_ool_ports_descriptor(mach_msg_ool_ports_descriptor_t *dsc,
     if(current_task() == kernel_task) {
         mach_msg_ool_ports_descriptor_t *user_ool_dsc = (typeof(user_ool_dsc))user_dsc;
         user_ool_dsc--;
+        bzero((void *)user_ool_dsc, sizeof(*user_ool_dsc));
 
         user_ool_dsc->address = (void *)(uintptr_t)rcv_addr;
         user_ool_dsc->deallocate = (copy_options == MACH_MSG_VIRTUAL_COPY) ?
@@ -3645,6 +4235,7 @@ ipc_kmsg_copyout_ool_ports_descriptor(mach_msg_ool_ports_descriptor_t *dsc,
     } if (is_64bit) {
         mach_msg_ool_ports_descriptor64_t *user_ool_dsc = (typeof(user_ool_dsc))user_dsc;
         user_ool_dsc--;
+        bzero((void *)user_ool_dsc, sizeof(*user_ool_dsc));
 
         user_ool_dsc->address = rcv_addr;
         user_ool_dsc->deallocate = (copy_options == MACH_MSG_VIRTUAL_COPY) ?
@@ -3658,6 +4249,7 @@ ipc_kmsg_copyout_ool_ports_descriptor(mach_msg_ool_ports_descriptor_t *dsc,
     } else {
         mach_msg_ool_ports_descriptor32_t *user_ool_dsc = (typeof(user_ool_dsc))user_dsc;
         user_ool_dsc--;
+        bzero((void *)user_ool_dsc, sizeof(*user_ool_dsc));
 
         user_ool_dsc->address = CAST_DOWN_EXPLICIT(uint32_t, rcv_addr);
         user_ool_dsc->count = count;
@@ -3891,6 +4483,9 @@ ipc_kmsg_copyout_pseudo(
        mach_port_name_t dest_name, reply_name;
        mach_msg_return_t mr;
 
+       /* Set ith_knote to ITH_KNOTE_PSEUDO */
+       current_thread()->ith_knote = ITH_KNOTE_PSEUDO;
+
        assert(IO_VALID(dest));
 
 #if 0
@@ -4171,6 +4766,28 @@ ipc_kmsg_copyout_to_kernel_legacy(
 }
 #endif /* IKM_SUPPORT_LEGACY */
 
+#ifdef __arm64__
+/*
+ * Just sets those parts of the trailer that aren't set up at allocation time.
+ */
+static void
+ipc_kmsg_munge_trailer(mach_msg_max_trailer_t *in, void *_out, boolean_t is64bit) 
+{
+       if (is64bit) {
+               mach_msg_max_trailer64_t *out = (mach_msg_max_trailer64_t*)_out;
+               out->msgh_seqno = in->msgh_seqno;
+               out->msgh_context = in->msgh_context;
+               out->msgh_trailer_size = in->msgh_trailer_size;
+               out->msgh_ad = in->msgh_ad;
+       } else {
+               mach_msg_max_trailer32_t *out = (mach_msg_max_trailer32_t*)_out;
+               out->msgh_seqno = in->msgh_seqno;
+               out->msgh_context = (mach_port_context32_t)in->msgh_context;
+               out->msgh_trailer_size = in->msgh_trailer_size;
+               out->msgh_ad = in->msgh_ad;
+       }
+}
+#endif /* __arm64__ */
 
 mach_msg_trailer_size_t
 ipc_kmsg_add_trailer(ipc_kmsg_t kmsg, ipc_space_t space __unused, 
@@ -4180,10 +4797,25 @@ ipc_kmsg_add_trailer(ipc_kmsg_t kmsg, ipc_space_t space __unused,
 {
        mach_msg_max_trailer_t *trailer;
 
+#ifdef __arm64__
+       mach_msg_max_trailer_t tmp_trailer; /* This accommodates U64, and we'll munge */
+       void *real_trailer_out = (void*)(mach_msg_max_trailer_t *)
+               ((vm_offset_t)kmsg->ikm_header +
+                round_msg(kmsg->ikm_header->msgh_size));
+
+       /* 
+        * Populate scratch with initial values set up at message allocation time.
+        * After, we reinterpret the space in the message as the right type 
+        * of trailer for the address space in question.
+        */
+       bcopy(real_trailer_out, &tmp_trailer, MAX_TRAILER_SIZE);
+       trailer = &tmp_trailer;
+#else /* __arm64__ */
        (void)thread;
        trailer = (mach_msg_max_trailer_t *)
                ((vm_offset_t)kmsg->ikm_header +
                 round_msg(kmsg->ikm_header->msgh_size));
+#endif /* __arm64__ */
 
        if (!(option & MACH_RCV_TRAILER_MASK)) {
                return trailer->msgh_trailer_size;
@@ -4213,6 +4845,9 @@ ipc_kmsg_add_trailer(ipc_kmsg_t kmsg, ipc_space_t space __unused,
        }
 
 done:
+#ifdef __arm64__
+       ipc_kmsg_munge_trailer(trailer, real_trailer_out, thread_is_64bit(thread));
+#endif /* __arm64__ */
 
        return trailer->msgh_trailer_size;
 }