]> 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 574d5531cb60e99f9eba255d66fe4a7cacf19239..736fe824c8d75eb4c70a54196fa9c3af3b1f4ff8 100644 (file)
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @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
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * 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
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
+/*
+ * NOTICE: This file was modified by McAfee Research in 2004 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ * Copyright (c) 2005 SPARTA, Inc.
+ */
 /*
  */
 /*
@@ -58,7 +70,6 @@
  *     Operations on kernel messages.
  */
 
-#include <norma_vm.h>
 
 #include <mach/mach_types.h>
 #include <mach/boolean.h>
 
 #include <kern/kern_types.h>
 #include <kern/assert.h>
+#include <kern/debug.h>
 #include <kern/ipc_kobject.h>
 #include <kern/kalloc.h>
 #include <kern/zalloc.h>
 #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 <vm/vm_map.h>
 #include <vm/vm_object.h>
 #include <ipc/ipc_right.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>
 
 #include <ppc/low_trace.h>
 #endif
 
+#if DEBUG
+#define DEBUG_MSGS_K64 1
+#endif
+
+#include <sys/kdebug.h>
+#include <libkern/OSAtomic.h>
+
+#pragma pack(4)
+
+typedef        struct 
+{
+  mach_msg_bits_t      msgh_bits;
+  mach_msg_size_t      msgh_size;
+  mach_port_name_t     msgh_remote_port;
+  mach_port_name_t     msgh_local_port;
+  mach_port_name_t     msgh_voucher_port;
+  mach_msg_id_t                msgh_id;
+} mach_msg_legacy_header_t;
+
+typedef struct
+{
+        mach_msg_legacy_header_t       header;
+        mach_msg_body_t         body;
+} mach_msg_legacy_base_t;
+
+typedef struct
+{
+  mach_port_name_t                             name;
+  mach_msg_size_t                              pad1;
+  uint32_t                                             pad2 : 16;
+  mach_msg_type_name_t                 disposition : 8;
+  mach_msg_descriptor_type_t   type : 8;
+} mach_msg_legacy_port_descriptor_t;
+
+
+typedef union
+{
+  mach_msg_legacy_port_descriptor_t                    port;
+  mach_msg_ool_descriptor32_t          out_of_line32;
+  mach_msg_ool_ports_descriptor32_t    ool_ports32;
+  mach_msg_type_descriptor_t                   type;
+} mach_msg_legacy_descriptor_t;
+
+#pragma pack()
+
+#define LEGACY_HEADER_SIZE_DELTA ((mach_msg_size_t)(sizeof(mach_msg_header_t) - sizeof(mach_msg_legacy_header_t)))
+
+// END LP64 fixes
+
+
+#if DEBUG_MSGS_K64
+extern void ipc_pset_print64(
+                       ipc_pset_t      pset);
+
+extern void    ipc_kmsg_print64(
+                       ipc_kmsg_t      kmsg,
+                       const char      *str);
+
+extern void    ipc_msg_print64(
+               mach_msg_header_t       *msgh);
+
+extern ipc_port_t ipc_name_to_data64(
+                       task_t                  task,
+                       mach_port_name_t        name);
+
+/*
+ * Forward declarations
+ */
+void ipc_msg_print_untyped64(
+       mach_msg_body_t         *body);
+
+const char * ipc_type_name64(
+       int             type_name,
+       boolean_t       received);
+
+void ipc_print_type_name64(
+       int     type_name);
+
+const char *
+msgh_bit_decode64(
+       mach_msg_bits_t bit);
+
+const char *
+mm_copy_options_string64(
+       mach_msg_copy_options_t option);
+
+void db_print_msg_uid64(mach_msg_header_t *);
+
+static void
+ipc_msg_body_print64(void *body, int size)
+{
+       uint32_t        *word = (uint32_t *) body;
+       uint32_t        *end  = (uint32_t *)(((uintptr_t) body) + size
+                                               - sizeof(mach_msg_header_t));
+       int             i;
+
+       kprintf("  body(%p-%p):\n    %p: ", body, end, word);
+       for (;;) {
+               for (i = 0; i < 8; i++, word++) {
+                       if (word >= end) {
+                               kprintf("\n");
+                               return;
+                       }
+                       kprintf("%08x ", *word); 
+               }
+               kprintf("\n    %p: ", word);
+       }
+}
+
+
+const char *
+ipc_type_name64(
+       int             type_name,
+       boolean_t       received)
+{
+       switch (type_name) {
+               case MACH_MSG_TYPE_PORT_NAME:
+               return "port_name";
+               
+               case MACH_MSG_TYPE_MOVE_RECEIVE:
+               if (received) {
+                       return "port_receive";
+               } else {
+                       return "move_receive";
+               }
+               
+               case MACH_MSG_TYPE_MOVE_SEND:
+               if (received) {
+                       return "port_send";
+               } else {
+                       return "move_send";
+               }
+               
+               case MACH_MSG_TYPE_MOVE_SEND_ONCE:
+               if (received) {
+                       return "port_send_once";
+               } else {
+                       return "move_send_once";
+               }
+               
+               case MACH_MSG_TYPE_COPY_SEND:
+               return "copy_send";
+               
+               case MACH_MSG_TYPE_MAKE_SEND:
+               return "make_send";
+               
+               case MACH_MSG_TYPE_MAKE_SEND_ONCE:
+               return "make_send_once";
+               
+               default:
+               return (char *) 0;
+       }
+}
+               
+void
+ipc_print_type_name64(
+       int     type_name)
+{
+       const char *name = ipc_type_name64(type_name, TRUE);
+       if (name) {
+               kprintf("%s", name);
+       } else {
+               kprintf("type%d", type_name);
+       }
+}
+
+/*
+ * ipc_kmsg_print64    [ debug ]
+ */
+void
+ipc_kmsg_print64(
+       ipc_kmsg_t      kmsg,
+       const char      *str)
+{
+       kprintf("%s kmsg=%p:\n", str, kmsg);
+       kprintf("  next=%p, prev=%p, size=%d",
+               kmsg->ikm_next,
+               kmsg->ikm_prev,
+               kmsg->ikm_size);
+       kprintf("\n");
+       ipc_msg_print64(kmsg->ikm_header);
+}
+
+const char *
+msgh_bit_decode64(
+       mach_msg_bits_t bit)
+{
+       switch (bit) {
+           case MACH_MSGH_BITS_COMPLEX:        return "complex";
+           case MACH_MSGH_BITS_CIRCULAR:       return "circular";
+           default:                            return (char *) 0;
+       }
+}
+
+/*
+ * ipc_msg_print64     [ debug ]
+ */
+void
+ipc_msg_print64(
+       mach_msg_header_t       *msgh)
+{
+       mach_msg_bits_t mbits;
+       unsigned int    bit, i;
+       const char      *bit_name;
+       int             needs_comma;
+
+       mbits = msgh->msgh_bits;
+       kprintf("  msgh_bits=0x%x: l=0x%x,r=0x%x\n",
+               mbits,
+               MACH_MSGH_BITS_LOCAL(msgh->msgh_bits),
+               MACH_MSGH_BITS_REMOTE(msgh->msgh_bits));
+
+       mbits = MACH_MSGH_BITS_OTHER(mbits) & MACH_MSGH_BITS_USED;
+       kprintf("  decoded bits:  ");
+       needs_comma = 0;
+       for (i = 0, bit = 1; i < sizeof(mbits) * 8; ++i, bit <<= 1) {
+               if ((mbits & bit) == 0)
+                       continue;
+               bit_name = msgh_bit_decode64((mach_msg_bits_t)bit);
+               if (bit_name)
+                       kprintf("%s%s", needs_comma ? "," : "", bit_name);
+               else
+                       kprintf("%sunknown(0x%x),", needs_comma ? "," : "", bit);
+               ++needs_comma;
+       }
+       if (msgh->msgh_bits & ~MACH_MSGH_BITS_USED) {
+               kprintf("%sunused=0x%x,", needs_comma ? "," : "",
+                      msgh->msgh_bits & ~MACH_MSGH_BITS_USED);
+       }
+       kprintf("\n");
+
+       needs_comma = 1;
+       if (msgh->msgh_remote_port) {
+               kprintf("  remote=%p(", msgh->msgh_remote_port);
+               ipc_print_type_name64(MACH_MSGH_BITS_REMOTE(msgh->msgh_bits));
+               kprintf(")");
+       } else {
+               kprintf("  remote=null");
+       }
+
+       if (msgh->msgh_local_port) {
+               kprintf("%slocal=%p(", needs_comma ? "," : "",
+                      msgh->msgh_local_port);
+               ipc_print_type_name64(MACH_MSGH_BITS_LOCAL(msgh->msgh_bits));
+               kprintf(")\n");
+       } else {
+               kprintf("local=null\n");
+       }
+
+       kprintf("  msgh_id=%d, size=%d\n",
+               msgh->msgh_id,
+               msgh->msgh_size);
+
+       if (mbits & MACH_MSGH_BITS_COMPLEX) {   
+               ipc_msg_print_untyped64((mach_msg_body_t *) (msgh + 1));
+       }
+
+       ipc_msg_body_print64((void *)(msgh + 1), msgh->msgh_size);
+}
+
+
+const char *
+mm_copy_options_string64(
+       mach_msg_copy_options_t option)
+{
+       const char      *name;
+
+       switch (option) {
+           case MACH_MSG_PHYSICAL_COPY:
+               name = "PHYSICAL";
+               break;
+           case MACH_MSG_VIRTUAL_COPY:
+               name = "VIRTUAL";
+               break;
+           case MACH_MSG_OVERWRITE:
+               name = "OVERWRITE(DEPRECATED)";
+               break;
+           case MACH_MSG_ALLOCATE:
+               name = "ALLOCATE";
+               break;
+           case MACH_MSG_KALLOC_COPY_T:
+               name = "KALLOC_COPY_T";
+               break;
+           default:
+               name = "unknown";
+               break;
+       }
+       return name;
+}
+
+void
+ipc_msg_print_untyped64(
+       mach_msg_body_t         *body)
+{
+    mach_msg_descriptor_t      *saddr, *send;
+    mach_msg_descriptor_type_t type;
+
+    kprintf("  %d descriptors: \n", body->msgh_descriptor_count);
+
+    saddr = (mach_msg_descriptor_t *) (body + 1);
+    send = saddr + body->msgh_descriptor_count;
+
+    for ( ; saddr < send; saddr++ ) {
+       
+       type = saddr->type.type;
+
+       switch (type) {
+           
+           case MACH_MSG_PORT_DESCRIPTOR: {
+               mach_msg_port_descriptor_t *dsc;
+
+               dsc = &saddr->port;
+               kprintf("    PORT name = %p disp = ", dsc->name);
+               ipc_print_type_name64(dsc->disposition);
+               kprintf("\n");
+               break;
+           }
+           case MACH_MSG_OOL_VOLATILE_DESCRIPTOR:
+           case MACH_MSG_OOL_DESCRIPTOR: {
+               mach_msg_ool_descriptor_t *dsc;
+               
+               dsc = (mach_msg_ool_descriptor_t *) &saddr->out_of_line;
+               kprintf("    OOL%s addr = %p size = 0x%x copy = %s %s\n",
+                       type == MACH_MSG_OOL_DESCRIPTOR ? "" : " VOLATILE",
+                       dsc->address, dsc->size,
+                       mm_copy_options_string64(dsc->copy),
+                       dsc->deallocate ? "DEALLOC" : "");
+               break;
+           } 
+           case MACH_MSG_OOL_PORTS_DESCRIPTOR : {
+               mach_msg_ool_ports_descriptor_t *dsc;
+
+               dsc = (mach_msg_ool_ports_descriptor_t *) &saddr->ool_ports;
+
+               kprintf("    OOL_PORTS addr = %p count = 0x%x ",
+                         dsc->address, dsc->count);
+               kprintf("disp = ");
+               ipc_print_type_name64(dsc->disposition);
+               kprintf(" copy = %s %s\n",
+                      mm_copy_options_string64(dsc->copy),
+                      dsc->deallocate ? "DEALLOC" : "");
+               break;
+           }
+
+           default: {
+               kprintf("    UNKNOWN DESCRIPTOR 0x%x\n", type);
+               break;
+           }
+       }
+    }
+}
+
+#define        DEBUG_IPC_KMSG_PRINT(kmsg,string)       \
+       __unreachable_ok_push   \
+       if (DEBUG_KPRINT_SYSCALL_PREDICATE(DEBUG_KPRINT_SYSCALL_IPC_MASK)) {    \
+               ipc_kmsg_print64(kmsg, string); \
+       }       \
+       __unreachable_ok_pop
+
+#define        DEBUG_IPC_MSG_BODY_PRINT(body,size)     \
+       __unreachable_ok_push   \
+       if (DEBUG_KPRINT_SYSCALL_PREDICATE(DEBUG_KPRINT_SYSCALL_IPC_MASK)) {    \
+               ipc_msg_body_print64(body,size);\
+       }       \
+       __unreachable_ok_pop
+#else /* !DEBUG_MSGS_K64 */
+#define DEBUG_IPC_KMSG_PRINT(kmsg,string)
+#define        DEBUG_IPC_MSG_BODY_PRINT(body,size)
+#endif  /* !DEBUG_MSGS_K64 */
 
 extern vm_map_t                ipc_kernel_copy_map;
+extern vm_size_t       ipc_kmsg_max_space;
 extern vm_size_t       ipc_kmsg_max_vm_space;
+extern vm_size_t       ipc_kmsg_max_body_space;
 extern vm_size_t       msg_ool_size_small;
 
 #define MSG_OOL_SIZE_SMALL     msg_ool_size_small
@@ -122,8 +518,8 @@ extern vm_size_t    msg_ool_size_small;
 #define OTHER_OOL_PORTS_DESCRIPTOR     mach_msg_ool_ports_descriptor64_t
 #endif
 
-#define DESC_SIZE_ADJUSTMENT   (sizeof(OTHER_OOL_DESCRIPTOR) - \
-                                sizeof(mach_msg_ool_descriptor_t))
+#define DESC_SIZE_ADJUSTMENT   ((mach_msg_size_t)(sizeof(mach_msg_ool_descriptor64_t) - \
+                                sizeof(mach_msg_ool_descriptor32_t)))
 
 /* scatter list macros */
 
@@ -150,15 +546,295 @@ MACRO_BEGIN                                                              \
        }                                                               \
 MACRO_END
 
-/* zone for cached ipc_kmsg_t structures */
-zone_t                 ipc_kmsg_zone;
+#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;
 
-/*
- * Forward declarations
- */
+       /*
+        * 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;
 
-void ipc_kmsg_clean(
-       ipc_kmsg_t      kmsg);
+       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;
+
+/*
+ * Forward declarations
+ */
+
+void ipc_kmsg_clean(
+       ipc_kmsg_t      kmsg);
 
 void ipc_kmsg_clean_body(
        ipc_kmsg_t      kmsg,
@@ -177,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.
@@ -200,14 +878,11 @@ ipc_kmsg_alloc(
        mach_msg_size_t max_expanded_size;
        ipc_kmsg_t kmsg;
 
-#if !defined(__LP64__)
-       mach_msg_size_t size = msg_and_trailer_size - MAX_TRAILER_SIZE;
-
        /*
         * LP64support -
         * Pad the allocation in case we need to expand the
         * message descrptors for user spaces with pointers larger than
-        * the kernel's own.  We don't know how many descriptors
+        * the kernel's own, or vice versa.  We don't know how many descriptors
         * there are yet, so just assume the whole body could be
         * descriptors (if there could be any at all).
         *
@@ -216,20 +891,27 @@ ipc_kmsg_alloc(
         * forward as we process them than it is to push all the
         * data backwards.
         */
-       max_expanded_size = 
-               (size > sizeof(mach_msg_base_t)) ?
-               (msg_and_trailer_size + DESC_SIZE_ADJUSTMENT * 
-                ((size - sizeof(mach_msg_base_t)) /
-                 (sizeof(mach_msg_ool_descriptor_t))))
-               :
-               (msg_and_trailer_size);
-#else
-       max_expanded_size = msg_and_trailer_size;
-#endif
+       mach_msg_size_t size = msg_and_trailer_size - MAX_TRAILER_SIZE;
+
+       /* compare against implementation upper limit for the body */
+       if (size > ipc_kmsg_max_body_space)
+               return IKM_NULL;
+
+       if (size > sizeof(mach_msg_base_t)) {
+               mach_msg_size_t max_desc = (mach_msg_size_t)(((size - sizeof(mach_msg_base_t)) /
+                                          sizeof(mach_msg_ool_descriptor32_t)) *
+                                          DESC_SIZE_ADJUSTMENT);
+
+               /* make sure expansion won't cause wrap */
+               if (msg_and_trailer_size > MACH_MSG_SIZE_MAX - max_desc)
+                       return IKM_NULL;
+
+               max_expanded_size = msg_and_trailer_size + max_desc;
+       } else
+         max_expanded_size = msg_and_trailer_size;
 
-       /* round up for ikm_cache */
        if (max_expanded_size < IKM_SAVED_MSG_SIZE)
-               max_expanded_size = IKM_SAVED_MSG_SIZE;
+               max_expanded_size = IKM_SAVED_MSG_SIZE;         /* round up for ikm_cache */
 
        if (max_expanded_size == IKM_SAVED_MSG_SIZE) {
                struct ikm_cache        *cache;
@@ -241,12 +923,9 @@ ipc_kmsg_alloc(
                        assert(i <= IKM_STASH);
                        kmsg = cache->entries[--i];
                        cache->avail = i;
-                       ikm_check_init(kmsg, max_expanded_size);
                        enable_preemption();
-                       kmsg->ikm_header = (mach_msg_header_t *)
-                                          ((vm_offset_t)(kmsg + 1) +
-                                           max_expanded_size -
-                                           msg_and_trailer_size);
+                       ikm_check_init(kmsg, max_expanded_size);
+                       ikm_set_header(kmsg, msg_and_trailer_size);
                        return (kmsg);
                }
                enable_preemption();
@@ -257,11 +936,9 @@ ipc_kmsg_alloc(
 
        if (kmsg != IKM_NULL) {
                ikm_init(kmsg, max_expanded_size);
-               kmsg->ikm_header = (mach_msg_header_t *)
-                                  ((vm_offset_t)(kmsg + 1) +
-                                   max_expanded_size -
-                                   msg_and_trailer_size);
+               ikm_set_header(kmsg, msg_and_trailer_size);
        }
+
        return(kmsg);
 }
 
@@ -284,6 +961,12 @@ ipc_kmsg_free(
        mach_msg_size_t size = kmsg->ikm_size;
        ipc_port_t port;
 
+       assert(!IP_VALID(kmsg->ikm_voucher));
+
+       KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_IPC,MACH_IPC_KMSG_FREE) | DBG_FUNC_NONE,
+                             VM_KERNEL_ADDRPERM((uintptr_t)kmsg),
+                             0, 0, 0, 0);
+
        /*
         * Check to see if the message is bound to the port.  If so,
         * mark it not in use.  If the port isn't already dead, then
@@ -296,9 +979,11 @@ ipc_kmsg_free(
                if (ip_active(port) && (port->ip_premsg == kmsg)) {
                        assert(IP_PREALLOC(port));
                        ip_unlock(port);
+                       ip_release(port);
                        return;
                }
-               ip_check_unlock(port);  /* May be last reference */
+                ip_unlock(port);
+               ip_release(port); /* May be last reference */
        }
 
        /*
@@ -335,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;
 }
 
 /*
@@ -353,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;
 }
@@ -382,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;
 
@@ -389,8 +1173,8 @@ ipc_kmsg_rmqueue(
                prev->ikm_next = next;
        }
        /* XXX Temporary debug logic */
-       assert(kmsg->ikm_next = IKM_BOGUS);
-       assert(kmsg->ikm_prev = IKM_BOGUS);
+       assert((kmsg->ikm_next = IKM_BOGUS) == IKM_BOGUS);
+       assert((kmsg->ikm_prev = IKM_BOGUS) == IKM_BOGUS);
 }
 
 /*
@@ -430,51 +1214,59 @@ void
 ipc_kmsg_destroy(
        ipc_kmsg_t      kmsg)
 {
-       ipc_kmsg_queue_t queue;
-       boolean_t empty;
-
        /*
-        *      ipc_kmsg_clean can cause more messages to be destroyed.
-        *      Curtail recursion by queueing messages.  If a message
-        *      is already queued, then this is a recursive call.
+        *      Destroying a message can cause more messages to be destroyed.
+        *      Curtail recursion by putting messages on the deferred
+        *      destruction queue.  If this was the first message on the
+        *      queue, this instance must process the full queue.
         */
+       if (ipc_kmsg_delayed_destroy(kmsg))
+               ipc_kmsg_reap_delayed();
+}
 
-       queue = &(current_thread()->ith_messages);
-       empty = ipc_kmsg_queue_empty(queue);
-       ipc_kmsg_enqueue(queue, kmsg);
+/*
+ *     Routine:        ipc_kmsg_delayed_destroy
+ *     Purpose:
+ *             Enqueues a kernel message for deferred destruction.
+ *     Returns:
+ *             Boolean indicator that the caller is responsible to reap
+ *             deferred messages.
+ */
 
-       if (empty) {
-               /* must leave kmsg in queue while cleaning it */
+boolean_t ipc_kmsg_delayed_destroy(
+       ipc_kmsg_t kmsg)
+{
+       ipc_kmsg_queue_t queue = &(current_thread()->ith_messages);
+       boolean_t first = ipc_kmsg_queue_empty(queue);
 
-               while ((kmsg = ipc_kmsg_queue_first(queue)) != IKM_NULL) {
-                       ipc_kmsg_clean(kmsg);
-                       ipc_kmsg_rmqueue(queue, kmsg);
-                       ipc_kmsg_free(kmsg);
-               }
-       }
+       ipc_kmsg_enqueue(queue, kmsg);
+       return first;
 }
 
 /*
- *     Routine:        ipc_kmsg_destroy_dest
+ *     Routine:        ipc_kmsg_destroy_queue
  *     Purpose:
- *             Destroys a kernel message.  Releases all rights,
- *             references, and memory held by the message (including
- *             the destination port reference.
- *             Frees the message.
+ *             Destroys messages from the per-thread
+ *             deferred reaping queue.
  *     Conditions:
  *             No locks held.
  */
+
 void
-ipc_kmsg_destroy_dest(
-       ipc_kmsg_t kmsg)
+ipc_kmsg_reap_delayed(void)
 {
-    ipc_port_t port;
-       
-    port = kmsg->ikm_header->msgh_remote_port;
+       ipc_kmsg_queue_t queue = &(current_thread()->ith_messages);
+       ipc_kmsg_t kmsg;
 
-    ipc_port_release(port);
-    kmsg->ikm_header->msgh_remote_port = MACH_PORT_NULL;
-    ipc_kmsg_destroy(kmsg);
+       /*
+        * must leave kmsg in queue while cleaning it to assure
+        * no nested calls recurse into here.
+        */
+       while ((kmsg = ipc_kmsg_queue_first(queue)) != IKM_NULL) {
+               ipc_kmsg_clean(kmsg);
+               ipc_kmsg_rmqueue(queue, kmsg);
+               ipc_kmsg_free(kmsg);
+       }
 }
 
 /*
@@ -486,21 +1278,19 @@ ipc_kmsg_destroy_dest(
  *     Conditions:
  *             No locks held.
  */
-
+static unsigned int _ipc_kmsg_clean_invalid_desc = 0;
 void
 ipc_kmsg_clean_body(
        __unused ipc_kmsg_t     kmsg,
        mach_msg_type_number_t  number,
        mach_msg_descriptor_t   *saddr)
 {
-    mach_msg_descriptor_t      *eaddr;
+    mach_msg_type_number_t     i;
 
     if ( number == 0 )
        return;
 
-    eaddr = saddr + number;
-
-    for ( ; saddr < eaddr; saddr++ ) {
+    for (i = 0 ; i < number; i++, saddr++ ) {
        
        switch (saddr->type.type) {
            
@@ -521,7 +1311,7 @@ ipc_kmsg_clean_body(
            case MACH_MSG_OOL_DESCRIPTOR : {
                mach_msg_ool_descriptor_t *dsc;
 
-               dsc = &saddr->out_of_line;
+               dsc = (mach_msg_ool_descriptor_t *)&saddr->out_of_line;
                
                /* 
                 * Destroy memory carried in the message 
@@ -538,7 +1328,7 @@ ipc_kmsg_clean_body(
                mach_msg_type_number_t          j;
                mach_msg_ool_ports_descriptor_t *dsc;
 
-               dsc = &saddr->ool_ports;
+               dsc = (mach_msg_ool_ports_descriptor_t  *)&saddr->ool_ports;
                objects = (ipc_object_t *) dsc->address;
 
                if (dsc->count == 0) {
@@ -563,11 +1353,11 @@ ipc_kmsg_clean_body(
                assert(dsc->count != 0);
 
                kfree(dsc->address, 
-                    (vm_size_t) dsc->count * sizeof(mach_port_name_t));
+                    (vm_size_t) dsc->count * sizeof(mach_port_t));
                break;
            }
            default : {
-               printf("cleanup: don't understand this type of descriptor\n");
+                   _ipc_kmsg_clean_invalid_desc++; /* don't understand this type of descriptor */
            }
        }
     }
@@ -597,14 +1387,24 @@ ipc_kmsg_clean_partial(
        ipc_object_t object;
        mach_msg_bits_t mbits = kmsg->ikm_header->msgh_bits;
 
+       /* deal with importance chain while we still have dest and voucher references */
+       ipc_importance_clean(kmsg);
+
        object = (ipc_object_t) kmsg->ikm_header->msgh_remote_port;
        assert(IO_VALID(object));
-       ipc_object_destroy(object, MACH_MSGH_BITS_REMOTE(mbits));
+       ipc_object_destroy_dest(object, MACH_MSGH_BITS_REMOTE(mbits));
 
        object = (ipc_object_t) kmsg->ikm_header->msgh_local_port;
        if (IO_VALID(object))
                ipc_object_destroy(object, MACH_MSGH_BITS_LOCAL(mbits));
 
+       object = (ipc_object_t) kmsg->ikm_voucher;
+       if (IO_VALID(object)) {
+               assert(MACH_MSGH_BITS_VOUCHER(mbits) == MACH_MSG_TYPE_MOVE_SEND);
+               ipc_object_destroy(object, MACH_MSG_TYPE_PORT_SEND);
+               kmsg->ikm_voucher = IP_NULL;
+       }
+
        if (paddr) {
                (void) vm_deallocate(ipc_kernel_copy_map, paddr, length);
        }
@@ -628,15 +1428,25 @@ ipc_kmsg_clean(
        ipc_object_t object;
        mach_msg_bits_t mbits;
 
+       /* deal with importance chain while we still have dest and voucher references */
+       ipc_importance_clean(kmsg);
+
        mbits = kmsg->ikm_header->msgh_bits;
        object = (ipc_object_t) kmsg->ikm_header->msgh_remote_port;
        if (IO_VALID(object))
-               ipc_object_destroy(object, MACH_MSGH_BITS_REMOTE(mbits));
+               ipc_object_destroy_dest(object, MACH_MSGH_BITS_REMOTE(mbits));
 
        object = (ipc_object_t) kmsg->ikm_header->msgh_local_port;
        if (IO_VALID(object))
                ipc_object_destroy(object, MACH_MSGH_BITS_LOCAL(mbits));
 
+       object = (ipc_object_t) kmsg->ikm_voucher;
+       if (IO_VALID(object)) {
+               assert(MACH_MSGH_BITS_VOUCHER(mbits) == MACH_MSG_TYPE_MOVE_SEND);
+               ipc_object_destroy(object, MACH_MSG_TYPE_PORT_SEND);
+               kmsg->ikm_voucher = IP_NULL;
+       }
+
        if (mbits & MACH_MSGH_BITS_COMPLEX) {
                mach_msg_body_t *body;
 
@@ -662,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);
 }
 
 /*
@@ -680,9 +1499,37 @@ 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);
 }
 
+/*
+ *     Routine:        ipc_kmsg_prealloc
+ *     Purpose:
+ *             Wraper to ipc_kmsg_alloc() to account for
+ *             header expansion requirements.
+ */
+ipc_kmsg_t
+ipc_kmsg_prealloc(mach_msg_size_t size)
+{
+#if defined(__LP64__)
+       if (size > MACH_MSG_SIZE_MAX - LEGACY_HEADER_SIZE_DELTA)
+               return IKM_NULL;
+
+       size += LEGACY_HEADER_SIZE_DELTA;
+#endif
+       return ipc_kmsg_alloc(size);
+}
 
 
 /*
@@ -696,6 +1543,7 @@ ipc_kmsg_clear_prealloc(
  *             MACH_MSG_SUCCESS        Acquired a message buffer.
  *             MACH_SEND_MSG_TOO_SMALL Message smaller than a header.
  *             MACH_SEND_MSG_TOO_SMALL Message size not long-word multiple.
+ *             MACH_SEND_TOO_LARGE     Message too large to ever be sent.
  *             MACH_SEND_NO_BUFFER     Couldn't allocate a message buffer.
  *             MACH_SEND_INVALID_DATA  Couldn't copy message data.
  */
@@ -709,23 +1557,90 @@ ipc_kmsg_get(
        mach_msg_size_t                 msg_and_trailer_size;
        ipc_kmsg_t                      kmsg;
        mach_msg_max_trailer_t          *trailer;
+       mach_msg_legacy_base_t      legacy_base;
+       mach_msg_size_t             len_copied;
+       legacy_base.body.msgh_descriptor_count = 0;
 
-       if ((size < sizeof(mach_msg_header_t)) || (size & 3))
+       if ((size < sizeof(mach_msg_legacy_header_t)) || (size & 3))
                return MACH_SEND_MSG_TOO_SMALL;
 
-       msg_and_trailer_size = size + MAX_TRAILER_SIZE;
+       if (size > ipc_kmsg_max_body_space)
+               return MACH_SEND_TOO_LARGE;
 
-       kmsg = ipc_kmsg_alloc(msg_and_trailer_size);
+       if(size == sizeof(mach_msg_legacy_header_t))
+               len_copied = sizeof(mach_msg_legacy_header_t);
+       else
+               len_copied = sizeof(mach_msg_legacy_base_t);
+
+       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;
+#endif
+       /* unreachable if !DEBUG */
+       __unreachable_ok_push
+       if (DEBUG_KPRINT_SYSCALL_PREDICATE(DEBUG_KPRINT_SYSCALL_IPC_MASK)) {
+               unsigned int j;
+               for (j=0; j<sizeof(legacy_base.header); j++) {
+                       kprintf("%02x\n", ((unsigned char*)&legacy_base.header)[j]);
+               }
+       }
+       __unreachable_ok_pop
 
+       msg_and_trailer_size = size + MAX_TRAILER_SIZE;
+       kmsg = ipc_kmsg_alloc(msg_and_trailer_size);
        if (kmsg == IKM_NULL)
                return MACH_SEND_NO_BUFFER;
 
-       if (copyinmsg(msg_addr, (char *) kmsg->ikm_header, size)) {
+       kmsg->ikm_header->msgh_size                     = size;
+       kmsg->ikm_header->msgh_bits                     = legacy_base.header.msgh_bits;
+       kmsg->ikm_header->msgh_remote_port      = CAST_MACH_NAME_TO_PORT(legacy_base.header.msgh_remote_port);
+       kmsg->ikm_header->msgh_local_port       = CAST_MACH_NAME_TO_PORT(legacy_base.header.msgh_local_port);
+       kmsg->ikm_header->msgh_voucher_port             = legacy_base.header.msgh_voucher_port;
+       kmsg->ikm_header->msgh_id                       = legacy_base.header.msgh_id;
+
+       DEBUG_KPRINT_SYSCALL_IPC("ipc_kmsg_get header:\n"
+                                                        "  size:               0x%.8x\n"
+                                                        "  bits:               0x%.8x\n"
+                                                        "  remote_port:        %p\n"
+                                                        "  local_port: %p\n"
+                                                        "  voucher_port:       0x%.8x\n"
+                                                        "  id:         %.8d\n",
+                                                        kmsg->ikm_header->msgh_size,
+                                                        kmsg->ikm_header->msgh_bits,
+                                                        kmsg->ikm_header->msgh_remote_port,
+                                                        kmsg->ikm_header->msgh_local_port,
+                                                        kmsg->ikm_header->msgh_voucher_port,
+                                                        kmsg->ikm_header->msgh_id);
+
+       if (copyinmsg(msg_addr, (char *)(kmsg->ikm_header + 1), size - (mach_msg_size_t)sizeof(mach_msg_header_t))) {
                ipc_kmsg_free(kmsg);
                return MACH_SEND_INVALID_DATA;
        }
 
-       kmsg->ikm_header->msgh_size = size;
+       /* unreachable if !DEBUG */
+       __unreachable_ok_push
+       if (DEBUG_KPRINT_SYSCALL_PREDICATE(DEBUG_KPRINT_SYSCALL_IPC_MASK))
+       {
+               kprintf("body: size: %lu\n", (size - sizeof(mach_msg_header_t)));
+               uint32_t i;
+               for(i=0;i*4 < (size - sizeof(mach_msg_header_t));i++)
+               {
+                       kprintf("%.4x\n",((uint32_t *)(kmsg->ikm_header + 1))[i]);
+               }
+       }
+       __unreachable_ok_pop
+       DEBUG_IPC_KMSG_PRINT(kmsg, "ipc_kmsg_get()");
 
        /* 
         * I reserve for the trailer the largest space (MAX_TRAILER_SIZE)
@@ -738,12 +1653,14 @@ ipc_kmsg_get(
        trailer->msgh_audit = current_thread()->task->audit_token;
        trailer->msgh_trailer_type = MACH_MSG_TRAILER_FORMAT_0;
        trailer->msgh_trailer_size = MACH_MSG_TRAILER_MINIMUM_SIZE;
-       
+
 #ifdef ppc
        if(trcWork.traceMask) dbgTrace(0x1100, (unsigned int)kmsg->ikm_header->msgh_id, 
                (unsigned int)kmsg->ikm_header->msgh_remote_port, 
                (unsigned int)kmsg->ikm_header->msgh_local_port, 0); 
 #endif
+
+       trailer->msgh_labels.sender = 0;
        *kmsgp = kmsg;
        return MACH_MSG_SUCCESS;
 }
@@ -776,9 +1693,8 @@ ipc_kmsg_get_from_kernel(
        ipc_port_t      dest_port;
 
        assert(size >= sizeof(mach_msg_header_t));
-//     assert((size & 3) == 0);
+       assert((size & 3) == 0);
 
-       assert(IP_VALID((ipc_port_t) msg->msgh_remote_port));
        dest_port = (ipc_port_t)msg->msgh_remote_port;
 
        msg_and_trailer_size = size + MAX_TRAILER_SIZE;
@@ -788,7 +1704,9 @@ ipc_kmsg_get_from_kernel(
         * clients.  These are set up for those kernel clients
         * which cannot afford to wait.
         */
-       if (IP_PREALLOC(dest_port)) {
+       if (IP_VALID(dest_port) && IP_PREALLOC(dest_port)) {
+               mach_msg_size_t max_desc = 0;
+
                ip_lock(dest_port);
                if (!ip_active(dest_port)) {
                        ip_unlock(dest_port);
@@ -796,17 +1714,27 @@ ipc_kmsg_get_from_kernel(
                }
                assert(IP_PREALLOC(dest_port));
                kmsg = dest_port->ip_premsg;
-               if (msg_and_trailer_size > kmsg->ikm_size) {
-                       ip_unlock(dest_port);
-                       return MACH_SEND_TOO_LARGE;
-               }
                if (ikm_prealloc_inuse(kmsg)) {
                        ip_unlock(dest_port);
                        return MACH_SEND_NO_BUFFER;
                }
+#if !defined(__LP64__)
+               if (msg->msgh_bits & MACH_MSGH_BITS_COMPLEX) {
+                       assert(size > sizeof(mach_msg_base_t));
+                       max_desc = ((mach_msg_base_t *)msg)->body.msgh_descriptor_count *
+                               DESC_SIZE_ADJUSTMENT;
+               }
+#endif
+               if (msg_and_trailer_size > kmsg->ikm_size - max_desc) {
+                       ip_unlock(dest_port);
+                       return MACH_SEND_TOO_LARGE;
+               }
                ikm_prealloc_set_inuse(kmsg, dest_port);
+               ikm_set_header(kmsg, msg_and_trailer_size);
                ip_unlock(dest_port);
-       } else {
+       }
+       else
+       {
                kmsg = ipc_kmsg_alloc(msg_and_trailer_size);
                if (kmsg == IKM_NULL)
                        return MACH_SEND_NO_BUFFER;
@@ -814,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;
 
        /* 
@@ -829,6 +1759,8 @@ ipc_kmsg_get_from_kernel(
        trailer->msgh_trailer_type = MACH_MSG_TRAILER_FORMAT_0;
        trailer->msgh_trailer_size = MACH_MSG_TRAILER_MINIMUM_SIZE;
 
+       trailer->msgh_labels.sender = 0;
+
        *kmsgp = kmsg;
        return MACH_MSG_SUCCESS;
 }
@@ -849,7 +1781,10 @@ ipc_kmsg_get_from_kernel(
  *             MACH_MSG_SUCCESS        The message was accepted.
  *             MACH_SEND_TIMED_OUT     Caller still has message.
  *             MACH_SEND_INTERRUPTED   Caller still has message.
+ *             MACH_SEND_INVALID_DEST  Caller still has message.
  */
+
+
 mach_msg_return_t
 ipc_kmsg_send(
        ipc_kmsg_t              kmsg,
@@ -857,12 +1792,61 @@ ipc_kmsg_send(
        mach_msg_timeout_t      send_timeout)
 {
        ipc_port_t port;
+       thread_t th = current_thread();
+       mach_msg_return_t error = MACH_MSG_SUCCESS;
+       boolean_t kernel_reply = FALSE;
+
+       /* Check if honor qlimit flag is set on thread. */
+       if ((th->options & TH_OPT_HONOR_QLIMIT) == TH_OPT_HONOR_QLIMIT) {
+               /* Remove the MACH_SEND_ALWAYS flag to honor queue limit. */
+               option &= (~MACH_SEND_ALWAYS);
+               /* Add the timeout flag since the message queue might be full. */
+               option |= MACH_SEND_TIMEOUT;
+               th->options &= (~TH_OPT_HONOR_QLIMIT);
+       }
+
+#if IMPORTANCE_INHERITANCE
+       boolean_t did_importance = FALSE;
+#if IMPORTANCE_TRACE
+       mach_msg_id_t imp_msgh_id = -1;
+       int           sender_pid  = -1;
+#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);
 
+#if IMPORTANCE_INHERITANCE
+retry:
+#endif /* IMPORTANCE_INHERITANCE */
+       /*
+        *      Can't deliver to a dead port.
+        *      However, we can pretend it got sent
+        *      and was then immediately destroyed.
+        */
+       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;
+       }
+
        if (port->ip_receiver == ipc_space_kernel) {
 
                /*
@@ -880,52 +1864,120 @@ ipc_kmsg_send(
                /*
                 * 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
        /*
-        *      Can't deliver to a dead port.
-        *      However, we can pretend it got sent
-        *      and was then immediately destroyed.
+        * Need to see if this message needs importance donation and/or
+        * propagation.  That routine can drop the port lock temporarily.
+        * If it does we'll have to revalidate the destination.
         */
-       if (!ip_active(port)) {
-               /*
-                *      We can't let ipc_kmsg_destroy deallocate
-                *      the port right, because we might end up
-                *      in an infinite loop trying to deliver
-                *      a send-once notification.
-                */
-
-               ip_release(port);
-               ip_check_unlock(port);
-               kmsg->ikm_header->msgh_remote_port = MACH_PORT_NULL;
-               ipc_kmsg_destroy(kmsg);
-               return MACH_MSG_SUCCESS;
+       if (did_importance == FALSE) {
+               did_importance = TRUE;
+               if (ipc_importance_send(kmsg, option))
+                       goto retry;
        }
+#endif /* IMPORTANCE_INHERITANCE */
 
-       if (kmsg->ikm_header->msgh_bits & MACH_MSGH_BITS_CIRCULAR) {
+       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);
 
-               /* don't allow the creation of a circular loop */
-
-               ipc_kmsg_destroy(kmsg);
-               return MACH_MSG_SUCCESS;
+               error = ipc_mqueue_send(&port->ip_messages, kmsg, option,
+                               send_timeout);
        }
 
-       /*
-        * We have a valid message and a valid reference on the port.
-        * we can unlock the port and call mqueue_send() on it's message
-        * queue.
+#if IMPORTANCE_INHERITANCE
+       if (did_importance == TRUE) {
+               __unused int importance_cleared = 0;
+               switch (error) {
+                       case MACH_SEND_TIMED_OUT:
+                       case MACH_SEND_NO_BUFFER:
+                       case MACH_SEND_INTERRUPTED:
+                       case MACH_SEND_INVALID_DEST:
+                               /*
+                                * We still have the kmsg and its
+                                * reference on the port.  But we
+                                * have to back out the importance
+                                * boost.
+                                *
+                                * The port could have changed hands,
+                                * be inflight to another destination,
+                                * etc...  But in those cases our
+                                * back-out will find the new owner
+                                * (and all the operations that
+                                * transferred the right should have
+                                * applied their own boost adjustments
+                                * to the old owner(s)).
+                                */
+                               importance_cleared = 1;
+                               ipc_importance_clean(kmsg);
+                               break;
+
+                       case MACH_MSG_SUCCESS:
+                       default:
+                               break;
+               }
+#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_TRACE */
+       }
+#endif /* IMPORTANCE_INHERITANCE */
+
+       /*
+        * If the port has been destroyed while we wait, treat the message
+        * as a successful delivery (like we do for an inactive port).
         */
-       ip_unlock(port);
-       return (ipc_mqueue_send(&port->ip_messages, kmsg, option, send_timeout));
+       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;
+       }
+
+       if (error != MACH_MSG_SUCCESS && kernel_reply) {
+               /*
+                * Kernel reply messages that fail can't be allowed to
+                * 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;
 }
 
 /*
@@ -944,18 +1996,92 @@ ipc_kmsg_send(
 
 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;
 
-       if (copyoutmsg((const char *) kmsg->ikm_header, msg_addr, size))
+       DEBUG_IPC_KMSG_PRINT(kmsg, "ipc_kmsg_put()");
+
+
+       DEBUG_KPRINT_SYSCALL_IPC("ipc_kmsg_put header:\n"
+                                                        "  size:               0x%.8x\n"
+                                                        "  bits:               0x%.8x\n"
+                                                        "  remote_port:        %p\n"
+                                                        "  local_port: %p\n"
+                                                        "  voucher_port:       0x%.8x\n"
+                                                        "  id:         %.8d\n",
+                                                        kmsg->ikm_header->msgh_size,
+                                                        kmsg->ikm_header->msgh_bits,
+                                                        kmsg->ikm_header->msgh_remote_port,
+                                                        kmsg->ikm_header->msgh_local_port,
+                                                        kmsg->ikm_header->msgh_voucher_port,
+                                                        kmsg->ikm_header->msgh_id);
+
+#if defined(__LP64__)
+       if (current_task() != kernel_task) { /* don't if receiver expects fully-cooked in-kernel msg; ux_exception */
+               mach_msg_legacy_header_t *legacy_header = 
+                       (mach_msg_legacy_header_t *)((vm_offset_t)(kmsg->ikm_header) + LEGACY_HEADER_SIZE_DELTA);
+
+               mach_msg_bits_t         bits            = kmsg->ikm_header->msgh_bits;
+               mach_msg_size_t         msg_size        = kmsg->ikm_header->msgh_size;
+               mach_port_name_t        remote_port     = CAST_MACH_PORT_TO_NAME(kmsg->ikm_header->msgh_remote_port);
+               mach_port_name_t        local_port      = CAST_MACH_PORT_TO_NAME(kmsg->ikm_header->msgh_local_port);
+               mach_port_name_t        voucher_port    = kmsg->ikm_header->msgh_voucher_port;
+               mach_msg_id_t           id                      = kmsg->ikm_header->msgh_id;
+
+               legacy_header->msgh_id                  = id;
+               legacy_header->msgh_local_port = local_port;
+               legacy_header->msgh_remote_port = remote_port;
+               legacy_header->msgh_voucher_port = voucher_port;
+               legacy_header->msgh_size                = msg_size - LEGACY_HEADER_SIZE_DELTA;
+               legacy_header->msgh_bits                = bits;
+
+               size -= LEGACY_HEADER_SIZE_DELTA;
+               kmsg->ikm_header = (mach_msg_header_t *)legacy_header;
+       }
+#endif
+
+       /* unreachable if !DEBUG */
+       __unreachable_ok_push
+       if (DEBUG_KPRINT_SYSCALL_PREDICATE(DEBUG_KPRINT_SYSCALL_IPC_MASK)) {
+               kprintf("ipc_kmsg_put header+body: %d\n", (size));
+               uint32_t i;
+               for(i=0;i*4 < size;i++)
+               {
+                       kprintf("%.4x\n",((uint32_t *)kmsg->ikm_header)[i]);
+               }
+               kprintf("type: %d\n", ((mach_msg_type_descriptor_t *)(((mach_msg_base_t *)kmsg->ikm_header)+1))->type);
+       }
+       __unreachable_ok_pop
+
+        /* 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;
 }
 
@@ -980,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:
@@ -991,16 +2166,6 @@ ipc_kmsg_put_to_kernel(
  *             and the bits field is updated.  The destination port
  *             will be a valid port pointer.
  *
- *             The notify argument implements the MACH_SEND_CANCEL option.
- *             If it is not MACH_PORT_NULL, it should name a receive right.
- *             If the processing of the destination port would generate
- *             a port-deleted notification (because the right for the
- *             destination port is destroyed and it had a request for
- *             a dead-name notification registered), and the port-deleted
- *             notification would be sent to the named receive right,
- *             then it isn't sent and the send-once right for the notify
- *             port is quietly destroyed.
- *
  *     Conditions:
  *             Nothing locked.
  *     Returns:
@@ -1008,9 +2173,6 @@ ipc_kmsg_put_to_kernel(
  *             MACH_SEND_INVALID_HEADER
  *                     Illegal value in the message header bits.
  *             MACH_SEND_INVALID_DEST  The space is dead.
- *             MACH_SEND_INVALID_NOTIFY
- *                     Notify is non-null and doesn't name a receive right.
- *                     (Either KERN_INVALID_NAME or KERN_INVALID_RIGHT.)
  *             MACH_SEND_INVALID_DEST  Can't copyin destination port.
  *                     (Either KERN_INVALID_NAME or KERN_INVALID_RIGHT.)
  *             MACH_SEND_INVALID_REPLY Can't copyin reply port.
@@ -1019,20 +2181,37 @@ ipc_kmsg_put_to_kernel(
 
 mach_msg_return_t
 ipc_kmsg_copyin_header(
-       mach_msg_header_t       *msg,
+       ipc_kmsg_t              kmsg,
        ipc_space_t             space,
-       mach_port_name_t        notify)
+       mach_msg_priority_t override,
+       mach_msg_option_t       *optionp)
 {
+       mach_msg_header_t *msg = kmsg->ikm_header;
        mach_msg_bits_t mbits = msg->msgh_bits & MACH_MSGH_BITS_USER;
-       mach_port_name_t dest_name = (mach_port_name_t)msg->msgh_remote_port;
-       mach_port_name_t reply_name = (mach_port_name_t)msg->msgh_local_port;
+       mach_port_name_t dest_name = CAST_MACH_PORT_TO_NAME(msg->msgh_remote_port);
+       mach_port_name_t reply_name = CAST_MACH_PORT_TO_NAME(msg->msgh_local_port);
+       mach_port_name_t voucher_name = MACH_PORT_NULL;
        kern_return_t kr;
 
        mach_msg_type_name_t dest_type = MACH_MSGH_BITS_REMOTE(mbits);
        mach_msg_type_name_t reply_type = MACH_MSGH_BITS_LOCAL(mbits);
-       ipc_object_t dest_port, reply_port;
-       ipc_port_t dest_soright, reply_soright;
-       ipc_port_t notify_port;
+       mach_msg_type_name_t voucher_type = MACH_MSGH_BITS_VOUCHER(mbits);
+       ipc_object_t dest_port = IO_NULL;
+       ipc_object_t reply_port = IO_NULL;
+       ipc_port_t dest_soright = IP_NULL;
+       ipc_port_t reply_soright = IP_NULL;
+       ipc_port_t voucher_soright = IP_NULL;
+       ipc_port_t release_port = IP_NULL;
+       ipc_port_t voucher_port = IP_NULL;
+       ipc_port_t voucher_release_port = IP_NULL;
+       ipc_entry_t dest_entry = IE_NULL;
+       ipc_entry_t reply_entry = IE_NULL;
+       ipc_entry_t voucher_entry = IE_NULL;
+
+       int assertcnt = 0;
+#if IMPORTANCE_INHERITANCE
+       boolean_t needboost = FALSE;
+#endif /* IMPORTANCE_INHERITANCE */
 
        if ((mbits != msg->msgh_bits) ||
            (!MACH_MSG_TYPE_PORT_ANY_SEND(dest_type)) ||
@@ -1041,441 +2220,828 @@ ipc_kmsg_copyin_header(
             !MACH_MSG_TYPE_PORT_ANY_SEND(reply_type)))
                return MACH_SEND_INVALID_HEADER;
 
-       reply_soright = IP_NULL; /* in case we go to invalid dest early */
+       if (!MACH_PORT_VALID(dest_name))
+               return MACH_SEND_INVALID_DEST;
 
        is_write_lock(space);
-       if (!space->is_active)
-               goto invalid_dest;
+       if (!is_active(space)) {
+               is_write_unlock(space);
+               return MACH_SEND_INVALID_DEST;
+       }
+       /* space locked and active */
 
-       if (!MACH_PORT_VALID(dest_name))
-               goto invalid_dest;
+       /*
+        *      If there is a voucher specified, make sure the disposition is
+        *      valid and the entry actually refers to a voucher port.  Don't
+        *      actually copy in until we validate destination and reply.
+        */
+       if (voucher_type != MACH_MSGH_BITS_ZERO) {
 
-       if (notify != MACH_PORT_NULL) {
-               ipc_entry_t entry;
+               voucher_name = msg->msgh_voucher_port;
 
-               if ((entry = ipc_entry_lookup(space, notify)) == IE_NULL) {
+               if (voucher_name == MACH_PORT_DEAD ||
+                   (voucher_type != MACH_MSG_TYPE_MOVE_SEND &&
+                    voucher_type != MACH_MSG_TYPE_COPY_SEND)) {
                        is_write_unlock(space);
-                       return MACH_SEND_INVALID_NOTIFY;
+                       return MACH_SEND_INVALID_VOUCHER;
                }
-               if((entry->ie_bits & MACH_PORT_TYPE_RECEIVE) == 0) {
-                       is_write_unlock(space);
-                       return MACH_SEND_INVALID_NOTIFY;
+
+               if (voucher_name != MACH_PORT_NULL) {
+                       voucher_entry = ipc_entry_lookup(space, voucher_name);
+                       if (voucher_entry == IE_NULL || 
+                           (voucher_entry->ie_bits & MACH_PORT_TYPE_SEND) == 0 ||
+                           io_kotype(voucher_entry->ie_object) != IKOT_VOUCHER) {
+                               is_write_unlock(space);
+                               return MACH_SEND_INVALID_VOUCHER;
+                       }
+               } else {
+                       voucher_type = MACH_MSG_TYPE_MOVE_SEND;
                }
+       }
 
-               notify_port = (ipc_port_t) entry->ie_object;
-       } else
-               notify_port = IP_NULL;
+       /*
+        *      Handle combinations of validating destination and reply; along
+        *      with copying in destination, reply, and voucher in an atomic way.
+        */
 
-       if (dest_name == reply_name) {
-               ipc_entry_t entry;
-               mach_port_name_t name = dest_name;
+       if (dest_name == voucher_name) {
 
                /*
-                *      Destination and reply ports are the same!
-                *      This is a little tedious to make atomic, because
-                *      there are 25 combinations of dest_type/reply_type.
-                *      However, most are easy.  If either is move-sonce,
-                *      then there must be an error.  If either are
-                *      make-send or make-sonce, then we must be looking
-                *      at a receive right so the port can't die.
-                *      The hard cases are the combinations of
-                *      copy-send and make-send.
+                *      If the destination name is the same as the voucher name,
+                *      the voucher_entry must already be known.  Either that or
+                *      the destination name is MACH_PORT_NULL (i.e. invalid).
                 */
-
-               entry = ipc_entry_lookup(space, name);
-               if (entry == IE_NULL)
+               dest_entry = voucher_entry;
+               if (dest_entry == IE_NULL) {
                        goto invalid_dest;
+               }
 
-               assert(reply_type != 0); /* because name not null */
-
-               if (!ipc_right_copyin_check(space, name, entry, reply_type))
-                       goto invalid_reply;
+               /*
+                *      Make sure a future copyin of the reply port will succeed.
+                *      Once we start copying in the dest/voucher pair, we can't
+                *      back out.
+                */
+               if (MACH_PORT_VALID(reply_name)) {
+                       assert(reply_type != 0); /* because reply_name not null */
 
-               if ((dest_type == MACH_MSG_TYPE_MOVE_SEND_ONCE) ||
-                   (reply_type == MACH_MSG_TYPE_MOVE_SEND_ONCE)) {
-                       /*
-                        *      Why must there be an error?  To get a valid
-                        *      destination, this entry must name a live
-                        *      port (not a dead name or dead port).  However
-                        *      a successful move-sonce will destroy a
-                        *      live entry.  Therefore the other copyin,
-                        *      whatever it is, would fail.  We've already
-                        *      checked for reply port errors above,
-                        *      so report a destination error.
-                        */
+                       /* It is just WRONG if dest, voucher, and reply are all the same. */
+                       if (voucher_name == reply_name) {
+                               goto invalid_reply;
+                       }
+                       reply_entry = ipc_entry_lookup(space, reply_name);
+                       if (reply_entry == IE_NULL) {
+                               goto invalid_reply;
+                       }
+                       assert(dest_entry != reply_entry); /* names are not equal */
+                       if (!ipc_right_copyin_check(space, reply_name, reply_entry, reply_type)) {
+                               goto invalid_reply;
+                       }
+               }
 
+               /* 
+                *      Do the joint copyin of the dest disposition and 
+                *      voucher disposition from the one entry/port.  We
+                *      already validated that the voucher copyin would
+                *      succeed (above).  So, any failure in combining
+                *      the copyins can be blamed on the destination.
+                */
+               kr = ipc_right_copyin_two(space, dest_name, dest_entry,
+                                         dest_type, voucher_type,
+                                         &dest_port, &dest_soright,
+                                         &release_port);
+               if (kr != KERN_SUCCESS) {
+                       assert(kr != KERN_INVALID_CAPABILITY);
                        goto invalid_dest;
-               } else if ((dest_type == MACH_MSG_TYPE_MAKE_SEND) ||
-                          (dest_type == MACH_MSG_TYPE_MAKE_SEND_ONCE) ||
-                          (reply_type == MACH_MSG_TYPE_MAKE_SEND) ||
-                          (reply_type == MACH_MSG_TYPE_MAKE_SEND_ONCE)) {
-                       kr = ipc_right_copyin(space, name, entry,
-                                             dest_type, FALSE,
-                                             &dest_port, &dest_soright);
-                       if (kr != KERN_SUCCESS)
-                               goto invalid_dest;
-
-                       /*
-                        *      Either dest or reply needs a receive right.
-                        *      We know the receive right is there, because
-                        *      of the copyin_check and copyin calls.  Hence
-                        *      the port is not in danger of dying.  If dest
-                        *      used the receive right, then the right needed
-                        *      by reply (and verified by copyin_check) will
-                        *      still be there.
-                        */
-
-                       assert(IO_VALID(dest_port));
-                       assert(entry->ie_bits & MACH_PORT_TYPE_RECEIVE);
-                       assert(dest_soright == IP_NULL);
+               }
+               voucher_port = (ipc_port_t)dest_port;
 
-                       kr = ipc_right_copyin(space, name, entry,
+               /* 
+                * could not have been one of these dispositions, 
+                * validated the port was a true kernel voucher port above,
+                * AND was successfully able to copyin both dest and voucher.
+                */
+               assert(dest_type != MACH_MSG_TYPE_MAKE_SEND);
+               assert(dest_type != MACH_MSG_TYPE_MAKE_SEND_ONCE);
+               assert(dest_type != MACH_MSG_TYPE_MOVE_SEND_ONCE);
+               
+               /*
+                *      Perform the delayed reply right copyin (guaranteed success).
+                */
+               if (reply_entry != IE_NULL) {
+                       kr = ipc_right_copyin(space, reply_name, reply_entry,
                                              reply_type, TRUE,
-                                             &reply_port, &reply_soright);
-
+                                             &reply_port, &reply_soright,
+                                             &release_port, &assertcnt);
+                       assert(assertcnt == 0);
                        assert(kr == KERN_SUCCESS);
-                       assert(reply_port == dest_port);
-                       assert(entry->ie_bits & MACH_PORT_TYPE_RECEIVE);
-                       assert(reply_soright == IP_NULL);
-               } else if ((dest_type == MACH_MSG_TYPE_COPY_SEND) &&
-                          (reply_type == MACH_MSG_TYPE_COPY_SEND)) {
-                       /*
-                        *      To make this atomic, just do one copy-send,
-                        *      and dup the send right we get out.
-                        */
-
-                       kr = ipc_right_copyin(space, name, entry,
-                                             dest_type, FALSE,
-                                             &dest_port, &dest_soright);
-                       if (kr != KERN_SUCCESS)
-                               goto invalid_dest;
-
-                       assert(entry->ie_bits & MACH_PORT_TYPE_SEND);
-                       assert(dest_soright == IP_NULL);
+               }
 
+       } else {
+               if (dest_name == reply_name) {
                        /*
-                        *      It's OK if the port we got is dead now,
-                        *      so reply_port is IP_DEAD, because the msg
-                        *      won't go anywhere anyway.
+                        *      Destination and reply ports are the same!
+                        *      This is very similar to the case where the
+                        *      destination and voucher ports were the same
+                        *      (except the reply port disposition is not
+                        *      previously validated).
                         */
+                       dest_entry = ipc_entry_lookup(space, dest_name);
+                       if (dest_entry == IE_NULL) {
+                               goto invalid_dest;
+                       }
+                       reply_entry = dest_entry;
+                       assert(reply_type != 0); /* because name not null */
 
-                       reply_port = (ipc_object_t)
-                               ipc_port_copy_send((ipc_port_t) dest_port);
-                       reply_soright = IP_NULL;
-               } else if ((dest_type == MACH_MSG_TYPE_MOVE_SEND) &&
-                          (reply_type == MACH_MSG_TYPE_MOVE_SEND)) {
-                       /*
-                        *      This is an easy case.  Just use our
-                        *      handy-dandy special-purpose copyin call
-                        *      to get two send rights for the price of one.
+                       /* 
+                        *      Do the joint copyin of the dest disposition and 
+                        *      reply disposition from the one entry/port.
                         */
-
-                       kr = ipc_right_copyin_two(space, name, entry,
-                                                 &dest_port, &dest_soright);
-                       if (kr != KERN_SUCCESS)
+                       kr = ipc_right_copyin_two(space, dest_name, dest_entry,
+                                                 dest_type, reply_type,
+                                                 &dest_port, &dest_soright,
+                                                 &release_port);
+                       if (kr == KERN_INVALID_CAPABILITY) {
+                               goto invalid_reply;
+                       } else if (kr != KERN_SUCCESS) {
                                goto invalid_dest;
-
-                       /* the entry might need to be deallocated */
-                       if (IE_BITS_TYPE(entry->ie_bits) == MACH_PORT_TYPE_NONE)
-                               ipc_entry_dealloc(space, name, entry);
-
+                       }
                        reply_port = dest_port;
-                       reply_soright = IP_NULL;
-               } else {
-                       ipc_port_t soright;
 
-                       assert(((dest_type == MACH_MSG_TYPE_COPY_SEND) &&
-                               (reply_type == MACH_MSG_TYPE_MOVE_SEND)) ||
-                              ((dest_type == MACH_MSG_TYPE_MOVE_SEND) &&
-                               (reply_type == MACH_MSG_TYPE_COPY_SEND)));
 
+               } else {
                        /*
-                        *      To make this atomic, just do a move-send,
-                        *      and dup the send right we get out.
+                        *      Handle destination and reply independently, as
+                        *      they are independent entries (even if the entries
+                        *      refer to the same port).
+                        *
+                        *      This can be the tough case to make atomic.
+                        *
+                        *      The difficult problem is serializing with port death.
+                        *      The bad case is when dest_port dies after its copyin,
+                        *      reply_port dies before its copyin, and dest_port dies before
+                        *      reply_port.  Then the copyins operated as if dest_port was
+                        *      alive and reply_port was dead, which shouldn't have happened
+                        *      because they died in the other order.
+                        *
+                        *      Note that it is easy for a user task to tell if
+                        *      a copyin happened before or after a port died.
+                        *      If a port dies before copyin, a dead-name notification
+                        *      is generated and the dead name's urefs are incremented,
+                        *      and if the copyin happens first, a port-deleted
+                        *      notification is generated.
+                        *
+                        *      Even so, avoiding that potentially detectable race is too
+                        *      expensive - and no known code cares about it.  So, we just
+                        *      do the expedient thing and copy them in one after the other.
                         */
 
-                       kr = ipc_right_copyin(space, name, entry,
-                                             MACH_MSG_TYPE_MOVE_SEND, FALSE,
-                                             &dest_port, &soright);
-                       if (kr != KERN_SUCCESS)
+                       dest_entry = ipc_entry_lookup(space, dest_name);
+                       if (dest_entry == IE_NULL) {
                                goto invalid_dest;
+                       }
+                       assert(dest_entry != voucher_entry);
 
-                       /* the entry might need to be deallocated */
+                       /*
+                        *      Make sure reply port entry is valid before dest copyin.
+                        */
+                       if (MACH_PORT_VALID(reply_name)) {
+                               if (reply_name == voucher_name) {
+                                       goto invalid_reply;
+                               }
+                               reply_entry = ipc_entry_lookup(space, reply_name);
+                               if (reply_entry == IE_NULL) {
+                                       goto invalid_reply;
+                               }
+                               assert(dest_entry != reply_entry); /* names are not equal */
+                               assert(reply_type != 0); /* because reply_name not null */
 
-                       if (IE_BITS_TYPE(entry->ie_bits) == MACH_PORT_TYPE_NONE)
-                               ipc_entry_dealloc(space, name, entry);
+                               if (!ipc_right_copyin_check(space, reply_name, reply_entry, reply_type)) {
+                                       goto invalid_reply;
+                               }
+                       }
 
                        /*
-                        *      It's OK if the port we got is dead now,
-                        *      so reply_port is IP_DEAD, because the msg
-                        *      won't go anywhere anyway.
+                        *      copyin the destination.
                         */
+                       kr = ipc_right_copyin(space, dest_name, dest_entry,
+                                             dest_type, FALSE,
+                                             &dest_port, &dest_soright,
+                                             &release_port, &assertcnt);
+                       assert(assertcnt == 0);
+                       if (kr != KERN_SUCCESS) {
+                               goto invalid_dest;
+                       }
+                       assert(IO_VALID(dest_port));
+                       assert(!IP_VALID(release_port));
 
-                       reply_port = (ipc_object_t)
-                               ipc_port_copy_send((ipc_port_t) dest_port);
-
-                       if (dest_type == MACH_MSG_TYPE_MOVE_SEND) {
-                               dest_soright = soright;
-                               reply_soright = IP_NULL;
+                       /*
+                        *      Copyin the pre-validated reply right.
+                        *      It's OK if the reply right has gone dead in the meantime.
+                        */
+                       if (MACH_PORT_VALID(reply_name)) {
+                               kr = ipc_right_copyin(space, reply_name, reply_entry,
+                                                     reply_type, TRUE,
+                                                     &reply_port, &reply_soright,
+                                                     &release_port, &assertcnt);
+                               assert(assertcnt == 0);
+                               assert(kr == KERN_SUCCESS);
                        } else {
-                               dest_soright = IP_NULL;
-                               reply_soright = soright;
+                               /* convert invalid name to equivalent ipc_object type */
+                               reply_port = (ipc_object_t)CAST_MACH_NAME_TO_PORT(reply_name);
                        }
                }
-       } else if (!MACH_PORT_VALID(reply_name)) {
-               ipc_entry_t entry;
-
-               /*
-                *      No reply port!  This is an easy case
-                *      to make atomic.  Just copyin the destination.
-                */
-
-               entry = ipc_entry_lookup(space, dest_name);
-               if (entry == IE_NULL)
-                       goto invalid_dest;
-
-               kr = ipc_right_copyin(space, dest_name, entry,
-                                     dest_type, FALSE,
-                                     &dest_port, &dest_soright);
-               if (kr != KERN_SUCCESS)
-                       goto invalid_dest;
-
-               /* the entry might need to be deallocated */
-
-               if (IE_BITS_TYPE(entry->ie_bits) == MACH_PORT_TYPE_NONE)
-                       ipc_entry_dealloc(space, dest_name, entry);
-
-               reply_port = (ipc_object_t) reply_name;
-               reply_soright = IP_NULL;
-       } else {
-               ipc_entry_t dest_entry, reply_entry;
 
                /*
-                *      This is the tough case to make atomic.
-                *      The difficult problem is serializing with port death.
-                *      At the time we copyin dest_port, it must be alive.
-                *      If reply_port is alive when we copyin it, then
-                *      we are OK, because we serialize before the death
-                *      of both ports.  Assume reply_port is dead at copyin.
-                *      Then if dest_port dies/died after reply_port died,
-                *      we are OK, because we serialize between the death
-                *      of the two ports.  So the bad case is when dest_port
-                *      dies after its copyin, reply_port dies before its
-                *      copyin, and dest_port dies before reply_port.  Then
-                *      the copyins operated as if dest_port was alive
-                *      and reply_port was dead, which shouldn't have happened
-                *      because they died in the other order.
-                *
-                *      Note that it is easy for a user task to tell if
-                *      a copyin happened before or after a port died.
-                *      For example, suppose both dest and reply are
-                *      send-once rights (types are both move-sonce) and
-                *      both rights have dead-name requests registered.
-                *      If a port dies before copyin, a dead-name notification
-                *      is generated and the dead name's urefs are incremented,
-                *      and if the copyin happens first, a port-deleted
-                *      notification is generated.
-                *
-                *      Note that although the entries are different,
-                *      dest_port and reply_port might still be the same.
-                *
-                * JMM - The code to handle this was too expensive and, anyway,
-                * we intend to separate the dest lookup from the reply copyin
-                * by a wide margin, so the user will have to learn to deal!
-                * I will be making the change soon!
+                * Finally can copyin the voucher right now that dest and reply
+                * are fully copied in (guaranteed success).
                 */
+               if (IE_NULL != voucher_entry) {
+                       kr = ipc_right_copyin(space, voucher_name, voucher_entry,
+                                             voucher_type, FALSE,
+                                             (ipc_object_t *)&voucher_port,
+                                             &voucher_soright,
+                                             &voucher_release_port,
+                                             &assertcnt);
+                       assert(assertcnt == 0);
+                       assert(KERN_SUCCESS == kr);
+                       assert(IP_VALID(voucher_port));
+                       assert(ip_active(voucher_port));
+               }
+       }
 
-               dest_entry = ipc_entry_lookup(space, dest_name);
-               if (dest_entry == IE_NULL)
-                       goto invalid_dest;
+       /*
+        * 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);
 
-               reply_entry = ipc_entry_lookup(space, reply_name);
-               if (reply_entry == IE_NULL)
-                       goto invalid_reply;
+       if (IE_BITS_TYPE(dest_entry->ie_bits) == MACH_PORT_TYPE_NONE) {
+               ipc_entry_dealloc(space, dest_name, dest_entry);
 
-               assert(dest_entry != reply_entry); /* names are not equal */
-               assert(reply_type != 0); /* because reply_name not null */
+               if (dest_entry == reply_entry) {
+                       reply_entry = IE_NULL;
+               }
 
-               if (!ipc_right_copyin_check(space, reply_name, reply_entry,
-                                           reply_type))
-                       goto invalid_reply;
+               if (dest_entry == voucher_entry) {
+                       voucher_entry = IE_NULL;
+               }
 
-               kr = ipc_right_copyin(space, dest_name, dest_entry,
-                                     dest_type, FALSE,
-                                     &dest_port, &dest_soright);
-               if (kr != KERN_SUCCESS)
-                       goto invalid_dest;
+               dest_entry = IE_NULL;
+       }
+       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 (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;
+       }
 
-               assert(IO_VALID(dest_port));
+       dest_type = ipc_object_copyin_type(dest_type);
+       reply_type = ipc_object_copyin_type(reply_type);
 
-               kr = ipc_right_copyin(space, reply_name, reply_entry,
-                                     reply_type, TRUE,
-                                     &reply_port, &reply_soright);
+       /*
+        * JMM - Without rdar://problem/6275821, this is the last place we can
+        * re-arm the send-possible notifications.  It may trigger unexpectedly
+        * early (send may NOT have failed), but better than missing.  We assure
+        * we won't miss by forcing MACH_SEND_ALWAYS if we got past arming.
+        */
+       if (((*optionp & MACH_SEND_NOTIFY) != 0) && 
+           dest_type != MACH_MSG_TYPE_PORT_SEND_ONCE &&
+           dest_entry != IE_NULL && dest_entry->ie_request != IE_REQ_NONE) {
+               ipc_port_t dport = (ipc_port_t)dest_port;
+
+               assert(dport != IP_NULL);
+               ip_lock(dport);
+               if (ip_active(dport) && dport->ip_receiver != ipc_space_kernel) {
+                       if (ip_full(dport)) {
+#if IMPORTANCE_INHERITANCE
+                               needboost = ipc_port_request_sparm(dport, dest_name, 
+                                                                  dest_entry->ie_request,
+                                                                  *optionp,
+                                                                  override);
+                               if (needboost == FALSE)
+                                       ip_unlock(dport);
+#else
+                               ipc_port_request_sparm(dport, dest_name,
+                                                      dest_entry->ie_request,
+                                                      *optionp,
+                                                                          override);
+                               ip_unlock(dport);
+#endif /* IMPORTANCE_INHERITANCE */
+                       } else {
+                               *optionp |= MACH_SEND_ALWAYS;
+                               ip_unlock(dport);
+                       }
+               } else {
+                       ip_unlock(dport);
+               }
+       }
 
-               assert(kr == KERN_SUCCESS);
+       is_write_unlock(space);
 
-               /* the entries might need to be deallocated */
+#if IMPORTANCE_INHERITANCE
+       /* 
+        * If our request is the first boosting send-possible
+        * notification this cycle, push the boost down the
+        * destination port.
+        */
+       if (needboost == TRUE) {
+               ipc_port_t dport = (ipc_port_t)dest_port;
 
-               if (IE_BITS_TYPE(reply_entry->ie_bits) == MACH_PORT_TYPE_NONE)
-                       ipc_entry_dealloc(space, reply_name, reply_entry);
+               /* dport still locked from above */
+               if (ipc_port_importance_delta(dport, IPID_OPTION_SENDPOSSIBLE, 1) == FALSE) {
+                       ip_unlock(dport);
+               }
+       }
+#endif /* IMPORTANCE_INHERITANCE */
 
-               if (IE_BITS_TYPE(dest_entry->ie_bits) == MACH_PORT_TYPE_NONE)
-                       ipc_entry_dealloc(space, dest_name, dest_entry);
+       if (dest_soright != IP_NULL) {
+               ipc_notify_port_deleted(dest_soright, dest_name);
+       }
+       if (reply_soright != IP_NULL) {
+               ipc_notify_port_deleted(reply_soright, reply_name);
+       }
+       if (voucher_soright != IP_NULL) {
+               ipc_notify_port_deleted(voucher_soright, voucher_name);
        }
 
        /*
-        *      At this point, dest_port, reply_port,
-        *      dest_soright, reply_soright are all initialized.
-        *      Any defunct entries have been deallocated.
-        *      The space is still write-locked, and we need to
-        *      make the MACH_SEND_CANCEL check.  The notify_port pointer
-        *      is still usable, because the copyin code above won't ever
-        *      deallocate a receive right, so its entry still exists
-        *      and holds a ref.  Note notify_port might even equal
-        *      dest_port or reply_port.
+        * 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)) {
 
-       if ((notify != MACH_PORT_NULL) &&
-           (dest_soright == notify_port)) {
-               ipc_port_release_sonce(dest_soright);
-               dest_soright = IP_NULL;
+               kmsg->ikm_voucher = voucher_port;
+               voucher_type = MACH_MSG_TYPE_MOVE_SEND;
        }
 
-       is_write_unlock(space);
-
-       if (dest_soright != IP_NULL)
-               ipc_notify_port_deleted(dest_soright, dest_name);
+       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;
 
-       if (reply_soright != IP_NULL)
-               ipc_notify_port_deleted(reply_soright, reply_name);
+       /* capture the qos value(s) for the kmsg */
+       ipc_kmsg_set_qos(kmsg, *optionp, override);
 
-       dest_type = ipc_object_copyin_type(dest_type);
-       reply_type = ipc_object_copyin_type(reply_type);
+       if (release_port != IP_NULL)
+               ip_release(release_port);
 
-       msg->msgh_bits = (MACH_MSGH_BITS_OTHER(mbits) |
-                         MACH_MSGH_BITS(dest_type, reply_type));
-       msg->msgh_remote_port = (ipc_port_t)dest_port;
-       msg->msgh_local_port = (ipc_port_t)reply_port;
+       if (voucher_release_port != IP_NULL)
+               ip_release(voucher_release_port);
 
        return MACH_MSG_SUCCESS;
 
 invalid_reply:
        is_write_unlock(space);
+
+       if (release_port != IP_NULL)
+               ip_release(release_port);
+
+       assert(voucher_port == IP_NULL);
+       assert(voucher_soright == IP_NULL);
+
        return MACH_SEND_INVALID_REPLY;
 
 invalid_dest:
        is_write_unlock(space);
+
+       if (release_port != IP_NULL)
+               ip_release(release_port);
+
        if (reply_soright != IP_NULL)
                ipc_notify_port_deleted(reply_soright, reply_name);
+
+       assert(voucher_port == IP_NULL);
+       assert(voucher_soright == IP_NULL);
+
        return MACH_SEND_INVALID_DEST;
 }
 
-/*
- *     Routine:        ipc_kmsg_copyin_body
- *     Purpose:
- *             "Copy-in" port rights and out-of-line memory
- *             in the message body.
- *
- *             In all failure cases, the message is left holding
- *             no rights or memory.  However, the message buffer
- *             is not deallocated.  If successful, the message
- *             contains a valid destination port.
- *     Conditions:
- *             Nothing locked.
- *     Returns:
- *             MACH_MSG_SUCCESS        Successful copyin.
- *             MACH_SEND_INVALID_MEMORY        Can't grab out-of-line memory.
- *             MACH_SEND_INVALID_RIGHT Can't copyin port right in body.
- *             MACH_SEND_INVALID_TYPE  Bad type specification.
- *             MACH_SEND_MSG_TOO_SMALL Body is too small for types/data.
- *             MACH_SEND_INVALID_RT_OOL_SIZE OOL Buffer too large for RT
- *             MACH_MSG_INVALID_RT_DESCRIPTOR Dealloc and RT are incompatible
- */
-
-#define DESC_COUNT_SMALL 64
+mach_msg_descriptor_t *ipc_kmsg_copyin_port_descriptor(
+        volatile mach_msg_port_descriptor_t *dsc,
+        mach_msg_legacy_port_descriptor_t *user_dsc,
+        ipc_space_t space,
+        ipc_object_t dest,
+        ipc_kmsg_t kmsg,
+        mach_msg_return_t *mr);
 
-mach_msg_return_t
-ipc_kmsg_copyin_body(
-       ipc_kmsg_t      kmsg,
-       ipc_space_t     space,
-       vm_map_t        map)
+void ipc_print_type_name(
+   int type_name);
+mach_msg_descriptor_t *
+ipc_kmsg_copyin_port_descriptor(
+        volatile mach_msg_port_descriptor_t *dsc,
+        mach_msg_legacy_port_descriptor_t *user_dsc_in,
+        ipc_space_t space,
+        ipc_object_t dest,
+        ipc_kmsg_t kmsg,
+        mach_msg_return_t *mr)
 {
-    ipc_object_t                       dest;
-    mach_msg_body_t            *body;
-    mach_msg_descriptor_t      *daddr, *naddr;
-    mach_msg_type_number_t     dsc_count;
-    boolean_t                  differs = MAP_SIZE_DIFFERS(map);
-    boolean_t                  complex = FALSE;
-    vm_size_t                  space_needed = 0;
-    vm_size_t                  desc_size_space[DESC_COUNT_SMALL];
-    vm_size_t                  *user_desc_sizes = NULL;
-    vm_offset_t                        paddr = 0;
-    vm_map_copy_t              copy = VM_MAP_COPY_NULL;
-    kern_return_t              kr;
-    mach_msg_type_number_t     i;
-    mach_msg_return_t          mr = MACH_MSG_SUCCESS;
-    
-    /*
-     * Determine if the target is a kernel port.
-     */
-    dest = (ipc_object_t) kmsg->ikm_header->msgh_remote_port;
-    body = (mach_msg_body_t *) (kmsg->ikm_header + 1);
-    naddr = (mach_msg_descriptor_t *) (body + 1);
-
-    dsc_count = body->msgh_descriptor_count;
-    if (dsc_count == 0)
-       return MACH_MSG_SUCCESS;
+    volatile mach_msg_legacy_port_descriptor_t *user_dsc = user_dsc_in;
+    mach_msg_type_name_t       user_disp;
+    mach_msg_type_name_t       result_disp;
+    mach_port_name_t           name;
+    ipc_object_t                       object;
+
+    user_disp = user_dsc->disposition;
+    result_disp = ipc_object_copyin_type(user_disp);
+
+    name = (mach_port_name_t)user_dsc->name;
+    if (MACH_PORT_VALID(name)) {
+
+        kern_return_t kr = ipc_object_copyin(space, name, user_disp, &object);
+        if (kr != KERN_SUCCESS) {
+            *mr = MACH_SEND_INVALID_RIGHT;
+            return NULL;
+        }
 
-    if (differs) {
-       user_desc_sizes = (dsc_count <= DESC_COUNT_SMALL) ?
-           &desc_size_space : kalloc(dsc_count * sizeof(vm_size_t));
-       if (user_desc_sizes == NULL) {
-           ipc_kmsg_clean_partial(kmsg,0,0,0,0);
-           return KERN_RESOURCE_SHORTAGE;
-       }
+        if ((result_disp == MACH_MSG_TYPE_PORT_RECEIVE) &&
+                ipc_port_check_circularity((ipc_port_t) object,
+                    (ipc_port_t) dest)) {
+            kmsg->ikm_header->msgh_bits |= MACH_MSGH_BITS_CIRCULAR;
+        }
+        dsc->name = (ipc_port_t) object;
+    } else {
+        dsc->name = CAST_MACH_NAME_TO_PORT(name);
     }
+    dsc->disposition = result_disp;
+    dsc->type = MACH_MSG_PORT_DESCRIPTOR;
 
-    /*
-     * Make an initial pass to determine kernal VM space requirements for
+    dsc->pad_end = 0; // debug, unnecessary
+
+    return (mach_msg_descriptor_t *)(user_dsc_in+1);
+}
+
+mach_msg_descriptor_t * ipc_kmsg_copyin_ool_descriptor(
+        mach_msg_ool_descriptor_t *dsc,
+        mach_msg_descriptor_t *user_dsc,
+        int is_64bit,
+        vm_offset_t *paddr,
+        vm_map_copy_t *copy,
+        vm_size_t *space_needed,
+        vm_map_t map,
+        mach_msg_return_t *mr);
+mach_msg_descriptor_t *
+ipc_kmsg_copyin_ool_descriptor(
+        mach_msg_ool_descriptor_t *dsc,
+        mach_msg_descriptor_t *user_dsc,
+        int is_64bit,
+        vm_offset_t *paddr,
+        vm_map_copy_t *copy,
+        vm_size_t *space_needed,
+        vm_map_t map,
+        mach_msg_return_t *mr)
+{
+    vm_size_t                          length;
+    boolean_t                          dealloc;
+    mach_msg_copy_options_t            copy_options;
+    mach_vm_offset_t           addr;
+    mach_msg_descriptor_type_t dsc_type;
+
+    if (is_64bit) {
+        mach_msg_ool_descriptor64_t *user_ool_dsc = (typeof(user_ool_dsc))user_dsc;
+
+        addr = (mach_vm_offset_t) user_ool_dsc->address;
+        length = user_ool_dsc->size;
+        dealloc = user_ool_dsc->deallocate;
+        copy_options = user_ool_dsc->copy;
+        dsc_type = user_ool_dsc->type;
+
+        user_dsc = (typeof(user_dsc))(user_ool_dsc+1);
+    } else {
+        mach_msg_ool_descriptor32_t *user_ool_dsc = (typeof(user_ool_dsc))user_dsc;
+
+        addr = CAST_USER_ADDR_T(user_ool_dsc->address);
+        dealloc = user_ool_dsc->deallocate;
+        copy_options = user_ool_dsc->copy;
+        dsc_type = user_ool_dsc->type;
+        length = user_ool_dsc->size;
+
+        user_dsc = (typeof(user_dsc))(user_ool_dsc+1);
+    }
+
+    dsc->size = (mach_msg_size_t)length;
+    dsc->deallocate = dealloc;
+    dsc->copy = copy_options;
+    dsc->type = dsc_type;
+
+    if (length == 0) {
+        dsc->address = NULL;
+    } else if ((length >= MSG_OOL_SIZE_SMALL) &&
+            (copy_options == MACH_MSG_PHYSICAL_COPY) && !dealloc) {
+
+        /*
+         * If the request is a physical copy and the source
+         * is not being deallocated, then allocate space
+         * in the kernel's pageable ipc copy map and copy
+         * the data in.  The semantics guarantee that the
+         * data will have been physically copied before
+         * the send operation terminates.  Thus if the data
+         * is not being deallocated, we must be prepared
+         * to page if the region is sufficiently large.
+         */
+        if (copyin(addr, (char *)*paddr, length)) {
+            *mr = MACH_SEND_INVALID_MEMORY;
+            return NULL;
+        }      
+
+        /*
+         * The kernel ipc copy map is marked no_zero_fill.
+         * If the transfer is not a page multiple, we need
+         * to zero fill the balance.
+         */
+        if (!page_aligned(length)) {
+            (void) memset((void *) (*paddr + length), 0,
+                    round_page(length) - length);
+        }
+        if (vm_map_copyin(ipc_kernel_copy_map, (vm_map_address_t)*paddr,
+                    (vm_map_size_t)length, TRUE, copy) != KERN_SUCCESS) {
+            *mr = MACH_MSG_VM_KERNEL;
+            return NULL;
+        }
+        dsc->address = (void *)*copy;
+        *paddr += round_page(length);
+        *space_needed -= round_page(length);
+    } else {
+
+        /*
+         * Make a vm_map_copy_t of the of the data.  If the
+         * data is small, this will do an optimized physical
+         * copy.  Otherwise, it will do a virtual copy.
+         *
+         * NOTE: A virtual copy is OK if the original is being
+         * deallocted, even if a physical copy was requested.
+         */
+        kern_return_t kr = vm_map_copyin(map, addr, 
+                (vm_map_size_t)length, dealloc, copy);
+        if (kr != KERN_SUCCESS) {
+            *mr = (kr == KERN_RESOURCE_SHORTAGE) ?
+                MACH_MSG_VM_KERNEL :
+                MACH_SEND_INVALID_MEMORY;
+            return NULL;
+        }
+        dsc->address = (void *)*copy;
+    }
+    return user_dsc;
+}
+
+mach_msg_descriptor_t * ipc_kmsg_copyin_ool_ports_descriptor(
+        mach_msg_ool_ports_descriptor_t *dsc,
+        mach_msg_descriptor_t *user_dsc,
+        int is_64bit,
+        vm_map_t map,
+        ipc_space_t space,
+        ipc_object_t dest,
+        ipc_kmsg_t kmsg,
+        mach_msg_return_t *mr);
+mach_msg_descriptor_t *
+ipc_kmsg_copyin_ool_ports_descriptor(
+        mach_msg_ool_ports_descriptor_t *dsc,
+        mach_msg_descriptor_t *user_dsc,
+        int is_64bit,
+        vm_map_t map,
+        ipc_space_t space,
+        ipc_object_t dest,
+        ipc_kmsg_t kmsg,
+        mach_msg_return_t *mr)
+{
+    void                                       *data;
+    ipc_object_t                       *objects;
+    unsigned int                               i;
+    mach_vm_offset_t                           addr;
+    mach_msg_type_name_t               user_disp;
+    mach_msg_type_name_t               result_disp;
+    mach_msg_type_number_t                     count;
+    mach_msg_copy_options_t                    copy_option;
+    boolean_t                          deallocate;
+    mach_msg_descriptor_type_t      type;
+    vm_size_t                          ports_length, names_length;
+
+    if (is_64bit) {
+        mach_msg_ool_ports_descriptor64_t *user_ool_dsc = (typeof(user_ool_dsc))user_dsc;
+
+        addr = (mach_vm_offset_t)user_ool_dsc->address;
+        count = user_ool_dsc->count;
+        deallocate = user_ool_dsc->deallocate;
+        copy_option = user_ool_dsc->copy;
+        user_disp = user_ool_dsc->disposition;
+        type = user_ool_dsc->type;
+
+        user_dsc = (typeof(user_dsc))(user_ool_dsc+1);
+    } else {
+        mach_msg_ool_ports_descriptor32_t *user_ool_dsc = (typeof(user_ool_dsc))user_dsc;
+
+        addr = CAST_USER_ADDR_T(user_ool_dsc->address);
+        count = user_ool_dsc->count;
+        deallocate = user_ool_dsc->deallocate;
+        copy_option = user_ool_dsc->copy;
+        user_disp = user_ool_dsc->disposition;
+        type = user_ool_dsc->type;
+
+        user_dsc = (typeof(user_dsc))(user_ool_dsc+1);
+    }
+
+    dsc->deallocate = deallocate;
+    dsc->copy = copy_option;
+    dsc->type = type;
+    dsc->count = count;
+    dsc->address = NULL;  /* for now */
+
+    result_disp = ipc_object_copyin_type(user_disp);
+    dsc->disposition = result_disp;
+
+    /* 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 */
+
+    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;
+    }
+
+    data = kalloc(ports_length);
+
+    if (data == NULL) {
+        *mr = MACH_SEND_NO_BUFFER;
+        return NULL;
+    }
+    
+#ifdef __LP64__
+    mach_port_name_t *names = &((mach_port_name_t *)data)[count];
+#else
+    mach_port_name_t *names = ((mach_port_name_t *)data);
+#endif
+
+    if (copyinmap(map, addr, names, names_length) != KERN_SUCCESS) {
+        kfree(data, ports_length);
+        *mr = MACH_SEND_INVALID_MEMORY;
+        return NULL;
+    }
+
+    if (deallocate) {
+        (void) mach_vm_deallocate(map, addr, (mach_vm_size_t)ports_length);
+    }
+
+    objects = (ipc_object_t *) data;
+    dsc->address = data;
+
+    for ( i = 0; i < count; i++) {
+        mach_port_name_t name = names[i];
+        ipc_object_t object;
+
+        if (!MACH_PORT_VALID(name)) {
+            objects[i] = (ipc_object_t)CAST_MACH_NAME_TO_PORT(name);
+            continue;
+        }
+
+        kern_return_t kr = ipc_object_copyin(space, name, user_disp, &object);
+
+        if (kr != KERN_SUCCESS) {
+            unsigned int j;
+
+            for(j = 0; j < i; j++) {
+                object = objects[j];
+                if (IPC_OBJECT_VALID(object))
+                    ipc_object_destroy(object, result_disp);
+            }
+            kfree(data, ports_length);
+            dsc->address = NULL;
+            *mr = MACH_SEND_INVALID_RIGHT;
+            return NULL;
+        }
+
+        if ((dsc->disposition == MACH_MSG_TYPE_PORT_RECEIVE) &&
+                ipc_port_check_circularity(
+                    (ipc_port_t) object,
+                    (ipc_port_t) dest))
+            kmsg->ikm_header->msgh_bits |= MACH_MSGH_BITS_CIRCULAR;
+
+        objects[i] = object;
+    }
+
+    return user_dsc;
+}
+
+/*
+ *     Routine:        ipc_kmsg_copyin_body
+ *     Purpose:
+ *             "Copy-in" port rights and out-of-line memory
+ *             in the message body.
+ *
+ *             In all failure cases, the message is left holding
+ *             no rights or memory.  However, the message buffer
+ *             is not deallocated.  If successful, the message
+ *             contains a valid destination port.
+ *     Conditions:
+ *             Nothing locked.
+ *     Returns:
+ *             MACH_MSG_SUCCESS        Successful copyin.
+ *             MACH_SEND_INVALID_MEMORY        Can't grab out-of-line memory.
+ *             MACH_SEND_INVALID_RIGHT Can't copyin port right in body.
+ *             MACH_SEND_INVALID_TYPE  Bad type specification.
+ *             MACH_SEND_MSG_TOO_SMALL Body is too small for types/data.
+ *             MACH_SEND_INVALID_RT_OOL_SIZE OOL Buffer too large for RT
+ *             MACH_MSG_INVALID_RT_DESCRIPTOR Dealloc and RT are incompatible
+ */
+
+mach_msg_return_t
+ipc_kmsg_copyin_body(
+       ipc_kmsg_t      kmsg,
+       ipc_space_t     space,
+       vm_map_t        map)
+{
+    ipc_object_t                       dest;
+    mach_msg_body_t            *body;
+    mach_msg_descriptor_t      *daddr, *naddr;
+    mach_msg_descriptor_t      *user_addr, *kern_addr;
+    mach_msg_type_number_t     dsc_count;
+    boolean_t                  is_task_64bit = (map->max_offset > VM_MAX_ADDRESS);
+    boolean_t                  complex = FALSE;
+    vm_size_t                  space_needed = 0;
+    vm_offset_t                        paddr = 0;
+    vm_map_copy_t              copy = VM_MAP_COPY_NULL;
+    mach_msg_type_number_t     i;
+    mach_msg_return_t          mr = MACH_MSG_SUCCESS;
+
+    vm_size_t           descriptor_size = 0;
+
+    mach_msg_type_number_t total_ool_port_count = 0;
+
+    /*
+     * Determine if the target is a kernel port.
+     */
+    dest = (ipc_object_t) kmsg->ikm_header->msgh_remote_port;
+    body = (mach_msg_body_t *) (kmsg->ikm_header + 1);
+    naddr = (mach_msg_descriptor_t *) (body + 1);
+
+    dsc_count = body->msgh_descriptor_count;
+    if (dsc_count == 0)
+       return MACH_MSG_SUCCESS;
+
+    /*
+     * Make an initial pass to determine kernal VM space requirements for
      * physical copies and possible contraction of the descriptors from
      * processes with pointers larger than the kernel's.
      */
-    daddr = 0;
+    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;
 
        /* make sure the descriptor fits in the message */
-       if (differs) {
+       if (is_task_64bit) {
            switch (daddr->type.type) {
            case MACH_MSG_OOL_DESCRIPTOR:
            case MACH_MSG_OOL_VOLATILE_DESCRIPTOR:
            case MACH_MSG_OOL_PORTS_DESCRIPTOR:
-               user_desc_sizes[i] = sizeof(OTHER_OOL_DESCRIPTOR);
-               break;
+                   descriptor_size += 16;
+            naddr = (typeof(naddr))((vm_offset_t)daddr + 16);
+            break;
            default:
-               user_desc_sizes[i] = sizeof(*daddr);
-               break;
+                   descriptor_size += 12;
+            naddr = (typeof(naddr))((vm_offset_t)daddr + 12);
+            break;
            }
-           naddr = (mach_msg_descriptor_t *)
-                   ((vm_offset_t)daddr + user_desc_sizes[i]);
        } else {
-           naddr = daddr + 1;
+        descriptor_size += 12;
+        naddr = (typeof(naddr))((vm_offset_t)daddr + 12);
        }
 
        if (naddr > (mach_msg_descriptor_t *)
            ((vm_offset_t)kmsg->ikm_header + kmsg->ikm_header->msgh_size)) {
-           ipc_kmsg_clean_partial(kmsg,0,0,0,0);
-           mr = MACH_SEND_MSG_TOO_SMALL;
-           goto out;
+               mr = MACH_SEND_MSG_TOO_SMALL;
+               goto clean_message;
        }
 
        switch (daddr->type.type) {
-           mach_msg_size_t size;
-
        case MACH_MSG_OOL_DESCRIPTOR:
        case MACH_MSG_OOL_VOLATILE_DESCRIPTOR:
-           size = (differs) ?
-               ((OTHER_OOL_DESCRIPTOR *)daddr)->size :
+        size = (is_task_64bit) ?
+               ((mach_msg_ool_descriptor64_t *)daddr)->size :
            daddr->out_of_line.size;
 
            if (daddr->out_of_line.copy != MACH_MSG_PHYSICAL_COPY &&
@@ -1483,11 +3049,10 @@ ipc_kmsg_copyin_body(
                /*
                 * Invalid copy option
                 */
-               ipc_kmsg_clean_partial(kmsg,0,0,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)) {
@@ -1496,329 +3061,131 @@ ipc_kmsg_copyin_body(
                 * Out-of-line memory descriptor, accumulate kernel
                 * memory requirements
                 */
+               if (space_needed + round_page(size) <= space_needed) {
+                       /* 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,0,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) !=
-           KERN_SUCCESS) {
-           ipc_kmsg_clean_partial(kmsg,0,0,0,0);
-               mr = MACH_MSG_VM_KERNEL;
-               goto out;
-       }
+        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 clean_message;
+        }
     }
 
-    /* 
-     * handle the OOL regions and port descriptors.
-     * We process them in reverse order starting with the last one
-     * scanned above.  That way, we can compact them up against
-     * the message body (if the user-descriptor size is larger than
-     * the kernel representation).
-     */
-    naddr -= 1;
-    do {
-
-       switch (daddr->type.type) {
-           
-           /* port descriptors are the same size everywhere, how nice */
-           case MACH_MSG_PORT_DESCRIPTOR: {
-               mach_msg_type_name_t            user_disp;
-               mach_msg_type_name_t            result_disp;
-               mach_port_name_t                name;
-               ipc_object_t                    object;
-               volatile mach_msg_port_descriptor_t     *dsc;
-               volatile mach_msg_port_descriptor_t     *user_dsc;
-               
-               user_dsc = &daddr->port;
-               dsc = &naddr->port;
-               
-               user_disp = user_dsc->disposition;
-               result_disp = ipc_object_copyin_type(user_disp);
-               
-               name = (mach_port_name_t)user_dsc->name;
-               if (MACH_PORT_VALID(name)) {
-
-                   kr = ipc_object_copyin(space, name, user_disp, &object);
-                   if (kr != KERN_SUCCESS) {
-                       mr = MACH_SEND_INVALID_RIGHT;
-                       break;
-                   }
-
-                   if ((result_disp == MACH_MSG_TYPE_PORT_RECEIVE) &&
-                       ipc_port_check_circularity((ipc_port_t) object,
-                                                  (ipc_port_t) dest)) {
-                       kmsg->ikm_header->msgh_bits |= MACH_MSGH_BITS_CIRCULAR;
-                   }
-                   dsc->name = (ipc_port_t) object;
-               } else {
-                   dsc->name = (mach_port_t)name;
-               }
-               dsc->disposition = result_disp;
-               dsc->type = MACH_MSG_PORT_DESCRIPTOR;
-               complex = TRUE;
-               break;
-           }
-
-           /* out of line descriptors differ in size between 32 and 64 bit processes */
-           case MACH_MSG_OOL_VOLATILE_DESCRIPTOR:
-           case MACH_MSG_OOL_DESCRIPTOR: {
-               vm_size_t                       length;
-               boolean_t                       dealloc;
-               mach_msg_copy_options_t         copy_options;
-               mach_vm_offset_t                addr;
-               mach_msg_descriptor_type_t      dsc_type;
-
-               volatile mach_msg_ool_descriptor_t      *dsc;
-
-               if (differs) {
-                   volatile OTHER_OOL_DESCRIPTOR       *user_dsc;
-
-                   user_dsc = (OTHER_OOL_DESCRIPTOR *)&daddr->out_of_line;
-                   addr = (mach_vm_offset_t) user_dsc->address;
-                   length = user_dsc->size;
-                   dealloc = user_dsc->deallocate;
-                   copy_options = user_dsc->copy;
-                   dsc_type = user_dsc->type;
-               } else {
-                   volatile mach_msg_ool_descriptor_t  *user_dsc;
-               
-                   user_dsc = &daddr->out_of_line;
-                   addr = CAST_USER_ADDR_T(user_dsc->address);
-                   dealloc = user_dsc->deallocate;
-                   copy_options = user_dsc->copy;
-                   dsc_type = user_dsc->type;
-                   length = user_dsc->size;
-               }
-
-               dsc = &naddr->out_of_line;
-               dsc->size = length;
-               dsc->deallocate = dealloc;
-               dsc->copy = copy_options;
-               dsc->type = dsc_type;
-
-               if (length == 0) {
-                   dsc->address = 0;
-               } else if ((length >= MSG_OOL_SIZE_SMALL) &&
-                          (copy_options == MACH_MSG_PHYSICAL_COPY) && !dealloc) {
-
-                       /*
-                        * If the request is a physical copy and the source
-                        * is not being deallocated, then allocate space
-                        * in the kernel's pageable ipc copy map and copy
-                        * the data in.  The semantics guarantee that the
-                        * data will have been physically copied before
-                        * the send operation terminates.  Thus if the data
-                        * is not being deallocated, we must be prepared
-                        * to page if the region is sufficiently large.
-                        */
-                       if (copyin(addr, (char *) paddr, length)) {
-                               mr = MACH_SEND_INVALID_MEMORY;
-                               break;
-                       }       
-
-                       /*
-                        * The kernel ipc copy map is marked no_zero_fill.
-                        * If the transfer is not a page multiple, we need
-                        * to zero fill the balance.
-                        */
-                       if (!page_aligned(length)) {
-                               (void) memset((void *) (paddr + length), 0,
-                                       round_page(length) - length);
-                       }
-                       if (vm_map_copyin(ipc_kernel_copy_map, (vm_map_address_t)paddr,
-                                         (vm_map_size_t)length, TRUE, &copy) != KERN_SUCCESS) {
-                           mr = MACH_MSG_VM_KERNEL;
-                           break;
-                       }
-                       dsc->address = (void *) copy;
-                       paddr += round_page(length);
-                       space_needed -= round_page(length);
-               } else {
-
-                       /*
-                        * Make a vm_map_copy_t of the of the data.  If the
-                        * data is small, this will do an optimized physical
-                        * copy.  Otherwise, it will do a virtual copy.
-                        *
-                        * NOTE: A virtual copy is OK if the original is being
-                        * deallocted, even if a physical copy was requested.
-                        */
-                       kr = vm_map_copyin(map, addr, 
-                                          (vm_map_size_t)length, dealloc, &copy);
-                       if (kr != KERN_SUCCESS) {
-                           mr = (kr == KERN_RESOURCE_SHORTAGE) ?
-                                  MACH_MSG_VM_KERNEL :
-                                  MACH_SEND_INVALID_MEMORY;
-                           break;
-                       }
-                       dsc->address = (void *) copy;
-               }
-               complex = TRUE;
-               break;
-           }
-           case MACH_MSG_OOL_PORTS_DESCRIPTOR: {
-               vm_size_t                               length;
-               void                                    *data;
-               ipc_object_t                            *objects;
-               unsigned int                            j;
-               mach_vm_offset_t                        addr;
-               mach_msg_type_name_t                    user_disp;
-               mach_msg_type_name_t                    result_disp;
-               mach_msg_type_number_t                  count;
-               mach_msg_copy_options_t                 copy_option;
-               boolean_t                               deallocate;
-
-               volatile mach_msg_ool_ports_descriptor_t        *dsc;
-
-               if (differs) {
-                   volatile OTHER_OOL_PORTS_DESCRIPTOR         *user_dsc;
-                   
-                   user_dsc = (OTHER_OOL_PORTS_DESCRIPTOR *)&daddr->ool_ports;
-                   addr = (mach_vm_offset_t)user_dsc->address;
-                   count = user_dsc->count;
-                   deallocate = user_dsc->deallocate;
-                   copy_option = user_dsc->copy;
-                   user_disp = user_dsc->disposition;
-               } else {
-                   volatile mach_msg_ool_ports_descriptor_t    *user_dsc;
-
-                   user_dsc = &daddr->ool_ports;
-                   addr = CAST_USER_ADDR_T(user_dsc->address);
-                   count = user_dsc->count;
-                   deallocate = user_dsc->deallocate;
-                   copy_option = user_dsc->copy;
-                   user_disp = user_dsc->disposition;
-               }
-
-               dsc = &naddr->ool_ports;
-               dsc->deallocate = deallocate;
-               dsc->copy = copy_option;
-               dsc->type = daddr->type.type;
-               dsc->count = count;
-
-               /* calculate length of data in bytes, rounding up */
-               length = count * sizeof(mach_port_name_t);
-               
-               if (length == 0) {
-                   complex = TRUE;
-                   dsc->address = (void *) 0;
-                   break;
-               }
-
-               data = kalloc(length);
-
-               if (data == NULL) {
-                   mr = MACH_SEND_NO_BUFFER;
-                   break;
-               }
-               
-               if (copyinmap(map, addr, data, length) != KERN_SUCCESS) {
-                   kfree(data, length);
-                   mr = MACH_SEND_INVALID_MEMORY;
-                   break;
-               }
+    /* user_addr = just after base as it was copied in */
+    user_addr = (mach_msg_descriptor_t *)((vm_offset_t)kmsg->ikm_header + sizeof(mach_msg_base_t));
 
-               if (deallocate) {
-                   (void) mach_vm_deallocate(map, addr, (mach_vm_size_t)length);
-               }
-               
-               dsc->address = data;
-               
-               result_disp = ipc_object_copyin_type(user_disp);
-               dsc->disposition = result_disp;
+    /* Shift the mach_msg_base_t down to make room for dsc_count*16bytes of descriptors */
+    if(descriptor_size != 16*dsc_count) {
+        vm_offset_t dsc_adjust = 16*dsc_count - descriptor_size;
 
-               objects = (ipc_object_t *) data;
-               
-               for ( j = 0; j < count; j++) {
-                   mach_port_name_t port = (mach_port_name_t) objects[j];
-                   ipc_object_t object;
-                   
-                   if (!MACH_PORT_VALID(port))
-                       continue;
-                   
-                   kr = ipc_object_copyin(space, port, user_disp, &object);
+        memmove((char *)(((vm_offset_t)kmsg->ikm_header) - dsc_adjust), kmsg->ikm_header, sizeof(mach_msg_base_t));
+        kmsg->ikm_header = (mach_msg_header_t *)((vm_offset_t)kmsg->ikm_header - dsc_adjust);
 
-                   if (kr != KERN_SUCCESS) {
-                       unsigned int k;
+        /* Update the message size for the larger in-kernel representation */
+        kmsg->ikm_header->msgh_size += (mach_msg_size_t)dsc_adjust;
+    }
 
-                       for(k = 0; k < j; k++) {
-                           object = objects[k];
-                           if (IPC_OBJECT_VALID(object))
-                               ipc_object_destroy(object, result_disp);
-                       }
-                       kfree(data, length);
-                       mr = MACH_SEND_INVALID_RIGHT;
-                       break;
-                   }
-                   
-                   if ((dsc->disposition == MACH_MSG_TYPE_PORT_RECEIVE) &&
-                       ipc_port_check_circularity(
-                                                  (ipc_port_t) object,
-                                                  (ipc_port_t) dest))
-                       kmsg->ikm_header->msgh_bits |= MACH_MSGH_BITS_CIRCULAR;
-                   
-                   objects[j] = object;
-               }
-               
-               complex = TRUE;
-               break;
-           }
-           default: {
-               /*
-                * Invalid descriptor
-                */
-               mr = MACH_SEND_INVALID_TYPE;
-               break;
-           }
-       }
 
-       if (MACH_MSG_SUCCESS != mr) {
-           ipc_kmsg_clean_partial(kmsg, dsc_count - i,
-                                  naddr + 1, paddr, space_needed);
-           goto out;
-       }
+    /* kern_addr = just after base after it has been (conditionally) moved */
+    kern_addr = (mach_msg_descriptor_t *)((vm_offset_t)kmsg->ikm_header + sizeof(mach_msg_base_t));
+
+    /* handle the OOL regions and port descriptors. */
+    for(i=0;i<dsc_count;i++) {
+        switch (user_addr->type.type) {
+            case MACH_MSG_PORT_DESCRIPTOR:
+                user_addr = ipc_kmsg_copyin_port_descriptor((mach_msg_port_descriptor_t *)kern_addr, 
+                        (mach_msg_legacy_port_descriptor_t *)user_addr, space, dest, kmsg, &mr);
+                kern_addr++;
+                complex = TRUE;
+                break;
+            case MACH_MSG_OOL_VOLATILE_DESCRIPTOR:
+            case MACH_MSG_OOL_DESCRIPTOR: 
+                user_addr = ipc_kmsg_copyin_ool_descriptor((mach_msg_ool_descriptor_t *)kern_addr, 
+                        user_addr, is_task_64bit, &paddr, &copy, &space_needed, map, &mr);
+                kern_addr++;
+                complex = TRUE;
+                break;
+            case MACH_MSG_OOL_PORTS_DESCRIPTOR: 
+                user_addr = ipc_kmsg_copyin_ool_ports_descriptor((mach_msg_ool_ports_descriptor_t *)kern_addr, 
+                        user_addr, is_task_64bit, map, space, dest, kmsg, &mr);
+                kern_addr++;
+                complex = TRUE;
+                break;
+            default:
+                /* Invalid descriptor */
+                mr = MACH_SEND_INVALID_TYPE;
+                break;
+        }
 
-    } while (--i > 0
-            && 
-            (daddr = (differs) ? (mach_msg_descriptor_t *)((vm_offset_t)(daddr) -
-                                 user_desc_sizes[i - 1]) : daddr - 1)
-            &&
-            naddr--);
+        if (MACH_MSG_SUCCESS != mr) {
+            /* clean from start of message descriptors to i */
+            ipc_kmsg_clean_partial(kmsg, i,
+                    (mach_msg_descriptor_t *)((mach_msg_base_t *)kmsg->ikm_header + 1),
+                    paddr, space_needed);
+            goto out;
+        }
+    } /* End of loop */ 
     
     if (!complex) {
        kmsg->ikm_header->msgh_bits &= ~MACH_MSGH_BITS_COMPLEX;
     }
-
-    if (differs && naddr != daddr) {
-       mach_msg_base_t *old_base = (mach_msg_base_t *)kmsg->ikm_header;
-       mach_msg_base_t *new_base = (mach_msg_base_t *)naddr - 1;
-
-       memmove(new_base, old_base, sizeof(mach_msg_base_t));
-       new_base->header.msgh_size -= (vm_offset_t)naddr - (vm_offset_t)daddr;
-       kmsg->ikm_header = &new_base->header;
-    }
-
  out:
-    if (differs && dsc_count > DESC_COUNT_SMALL)
-       kfree(user_desc_sizes, body->msgh_descriptor_count * sizeof(vm_size_t));
-
     return mr;
+
+clean_message:
+       /* no descriptors have been copied in yet */
+       ipc_kmsg_clean_partial(kmsg, 0, NULL, 0, 0);
+       return mr;
 }
 
 
@@ -1838,7 +3205,6 @@ ipc_kmsg_copyin_body(
  *             MACH_MSG_SUCCESS        Successful copyin.
  *             MACH_SEND_INVALID_HEADER
  *                     Illegal value in the message header bits.
- *             MACH_SEND_INVALID_NOTIFY        Bad notify port.
  *             MACH_SEND_INVALID_DEST  Can't copyin destination port.
  *             MACH_SEND_INVALID_REPLY Can't copyin reply port.
  *             MACH_SEND_INVALID_MEMORY        Can't grab out-of-line memory.
@@ -1852,18 +3218,52 @@ ipc_kmsg_copyin(
        ipc_kmsg_t              kmsg,
        ipc_space_t             space,
        vm_map_t                map,
-       mach_port_name_t        notify)
+       mach_msg_priority_t override,
+       mach_msg_option_t       *optionp)
 {
     mach_msg_return_t          mr;
-    
-    mr = ipc_kmsg_copyin_header(kmsg->ikm_header, space, notify);
+
+    kmsg->ikm_header->msgh_bits &= MACH_MSGH_BITS_USER;
+
+    mr = ipc_kmsg_copyin_header(kmsg, space, override, optionp);
+
     if (mr != MACH_MSG_SUCCESS)
        return mr;
-    
+
+    KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_IPC,MACH_IPC_MSG_SEND) | DBG_FUNC_NONE,
+                         VM_KERNEL_ADDRPERM((uintptr_t)kmsg),
+                         (uintptr_t)kmsg->ikm_header->msgh_bits,
+                         (uintptr_t)kmsg->ikm_header->msgh_id,
+                         VM_KERNEL_ADDRPERM((uintptr_t)unsafe_convert_port_to_voucher(kmsg->ikm_voucher)),
+                         0);
+
+    DEBUG_KPRINT_SYSCALL_IPC("ipc_kmsg_copyin header:\n%.8x\n%.8x\n%p\n%p\n%p\n%.8x\n",
+                            kmsg->ikm_header->msgh_size,
+                            kmsg->ikm_header->msgh_bits,
+                            kmsg->ikm_header->msgh_remote_port,
+                            kmsg->ikm_header->msgh_local_port,
+                            kmsg->ikm_voucher,
+                            kmsg->ikm_header->msgh_id);
+
     if ((kmsg->ikm_header->msgh_bits & MACH_MSGH_BITS_COMPLEX) == 0)
        return MACH_MSG_SUCCESS;
     
-    return( ipc_kmsg_copyin_body( kmsg, space, map) );
+       mr = ipc_kmsg_copyin_body( kmsg, space, map);
+
+       /* unreachable if !DEBUG */
+       __unreachable_ok_push
+       if (DEBUG_KPRINT_SYSCALL_PREDICATE(DEBUG_KPRINT_SYSCALL_IPC_MASK))
+       {
+               kprintf("body:\n");
+               uint32_t i;
+               for(i=0;i*4 < (kmsg->ikm_header->msgh_size - sizeof(mach_msg_header_t));i++)
+               {
+                       kprintf("%.4x\n",((uint32_t *)(kmsg->ikm_header + 1))[i]);
+               }
+       }
+       __unreachable_ok_pop
+
+       return mr;
 }
 
 /*
@@ -1875,14 +3275,11 @@ ipc_kmsg_copyin(
  *             Because the message comes from the kernel,
  *             the implementation assumes there are no errors
  *             or peculiarities in the message.
- *
- *             Returns TRUE if queueing the message
- *             would result in a circularity.
  *     Conditions:
  *             Nothing locked.
  */
 
-void
+mach_msg_return_t
 ipc_kmsg_copyin_from_kernel(
        ipc_kmsg_t      kmsg)
 {
@@ -1893,6 +3290,8 @@ ipc_kmsg_copyin_from_kernel(
        ipc_object_t local = (ipc_object_t) kmsg->ikm_header->msgh_local_port;
 
        /* translate the destination and reply ports */
+       if (!IO_VALID(remote))
+               return MACH_SEND_INVALID_DEST;
 
        ipc_object_copyin_from_kernel(remote, rname);
        if (IO_VALID(local))
@@ -1916,17 +3315,18 @@ ipc_kmsg_copyin_from_kernel(
 
                kmsg->ikm_header->msgh_bits = bits;
                if ((bits & MACH_MSGH_BITS_COMPLEX) == 0)
-                       return;
+                       return MACH_MSG_SUCCESS;
        }
     {
-       mach_msg_descriptor_t   *saddr, *eaddr;
+       mach_msg_descriptor_t   *saddr;
        mach_msg_body_t         *body;
+       mach_msg_type_number_t  i, count;
 
        body = (mach_msg_body_t *) (kmsg->ikm_header + 1);
        saddr = (mach_msg_descriptor_t *) (body + 1);
-       eaddr = (mach_msg_descriptor_t *) saddr + body->msgh_descriptor_count;
+       count = body->msgh_descriptor_count;
 
-       for ( ; saddr <  eaddr; saddr++) {
+       for (i = 0; i < count; i++, saddr++) {
 
            switch (saddr->type.type) {
            
@@ -1977,7 +3377,7 @@ ipc_kmsg_copyin_from_kernel(
                    mach_msg_type_name_t                name;
                    mach_msg_ool_ports_descriptor_t     *dsc;
                
-                   dsc = &saddr->ool_ports;
+                   dsc = (mach_msg_ool_ports_descriptor_t *)&saddr->ool_ports;
 
                    /* this is really the type SEND, SEND_ONCE, etc. */
                    name = dsc->disposition;
@@ -2009,34 +3409,202 @@ ipc_kmsg_copyin_from_kernel(
            }
        }
     }
+    return MACH_MSG_SUCCESS;
 }
 
-/*
- *     Routine:        ipc_kmsg_copyout_header
- *     Purpose:
- *             "Copy-out" port rights in the header of a message.
- *             Operates atomically; if it doesn't succeed the
- *             message header and the space are left untouched.
- *             If it does succeed the remote/local port fields
- *             contain port names instead of object pointers,
- *             and the bits field is updated.
- *
- *             The notify argument implements the MACH_RCV_NOTIFY option.
- *             If it is not MACH_PORT_NULL, it should name a receive right.
- *             If the process of receiving the reply port creates a
- *             new right in the receiving task, then the new right is
- *             automatically registered for a dead-name notification,
- *             with the notify port supplying the send-once right.
- *     Conditions:
- *             Nothing locked.
- *     Returns:
- *             MACH_MSG_SUCCESS        Copied out port rights.
- *             MACH_RCV_INVALID_NOTIFY 
- *                     Notify is non-null and doesn't name a receive right.
- *                     (Either KERN_INVALID_NAME or KERN_INVALID_RIGHT.)
- *             MACH_RCV_HEADER_ERROR|MACH_MSG_IPC_SPACE
- *                     The space is dead.
- *             MACH_RCV_HEADER_ERROR|MACH_MSG_IPC_SPACE
+#if IKM_SUPPORT_LEGACY
+mach_msg_return_t
+ipc_kmsg_copyin_from_kernel_legacy(
+       ipc_kmsg_t      kmsg)
+{
+       mach_msg_bits_t bits = kmsg->ikm_header->msgh_bits;
+       mach_msg_type_name_t rname = MACH_MSGH_BITS_REMOTE(bits);
+       mach_msg_type_name_t lname = MACH_MSGH_BITS_LOCAL(bits);
+       ipc_object_t remote = (ipc_object_t) kmsg->ikm_header->msgh_remote_port;
+       ipc_object_t local = (ipc_object_t) kmsg->ikm_header->msgh_local_port;
+
+       /* translate the destination and reply ports */
+       if (!IO_VALID(remote))
+               return MACH_SEND_INVALID_DEST;
+
+       ipc_object_copyin_from_kernel(remote, rname);
+       if (IO_VALID(local))
+               ipc_object_copyin_from_kernel(local, lname);
+
+       /*
+        *      The common case is a complex message with no reply port,
+        *      because that is what the memory_object interface uses.
+        */
+
+       if (bits == (MACH_MSGH_BITS_COMPLEX |
+                    MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, 0))) {
+               bits = (MACH_MSGH_BITS_COMPLEX |
+                       MACH_MSGH_BITS(MACH_MSG_TYPE_PORT_SEND, 0));
+
+               kmsg->ikm_header->msgh_bits = bits;
+       } else {
+               bits = (MACH_MSGH_BITS_OTHER(bits) |
+                       MACH_MSGH_BITS(ipc_object_copyin_type(rname),
+                                      ipc_object_copyin_type(lname)));
+
+               kmsg->ikm_header->msgh_bits = bits;
+               if ((bits & MACH_MSGH_BITS_COMPLEX) == 0)
+                       return MACH_MSG_SUCCESS;
+       }
+    {
+       mach_msg_legacy_descriptor_t    *saddr;
+        mach_msg_descriptor_t  *daddr;
+       mach_msg_body_t         *body;
+       mach_msg_type_number_t  i, count;
+
+       body = (mach_msg_body_t *) (kmsg->ikm_header + 1);
+       saddr = (typeof(saddr)) (body + 1);
+       count = body->msgh_descriptor_count;
+
+    if(count) {
+        vm_offset_t dsc_adjust = 4*count;
+        memmove((char *)(((vm_offset_t)kmsg->ikm_header) - dsc_adjust), kmsg->ikm_header, sizeof(mach_msg_base_t));
+        kmsg->ikm_header = (mach_msg_header_t *)((vm_offset_t)kmsg->ikm_header - dsc_adjust);
+        /* Update the message size for the larger in-kernel representation */
+        kmsg->ikm_header->msgh_size += dsc_adjust;
+    }
+    daddr = (mach_msg_descriptor_t *)((vm_offset_t)kmsg->ikm_header + sizeof(mach_msg_base_t));
+
+       for (i = 0; i < count; i++, saddr++, daddr++) {
+           switch (saddr->type.type) {
+           
+               case MACH_MSG_PORT_DESCRIPTOR: {
+                   mach_msg_type_name_t        name;
+                   ipc_object_t                object;
+                   mach_msg_legacy_port_descriptor_t   *dsc;
+                   mach_msg_port_descriptor_t  *dest_dsc;
+               
+                   dsc = (typeof(dsc))&saddr->port;
+            dest_dsc = &daddr->port;
+               
+                   /* this is really the type SEND, SEND_ONCE, etc. */
+                   name = dsc->disposition;
+                   object = (ipc_object_t) CAST_MACH_NAME_TO_PORT(dsc->name);
+                   dest_dsc->disposition = ipc_object_copyin_type(name);
+            dest_dsc->name = (mach_port_t)object;
+            dest_dsc->type = MACH_MSG_PORT_DESCRIPTOR;
+               
+                   if (!IO_VALID(object)) {
+                       break;
+                   }
+
+                   ipc_object_copyin_from_kernel(object, name);
+                   
+                   /* CDY avoid circularity when the destination is also */
+                   /* the kernel.  This check should be changed into an  */
+                   /* assert when the new kobject model is in place since*/
+                   /* ports will not be used in kernel to kernel chats   */
+                       
+                   if (((ipc_port_t)remote)->ip_receiver != ipc_space_kernel) {
+                      if ((dest_dsc->disposition == MACH_MSG_TYPE_PORT_RECEIVE) &&
+                          ipc_port_check_circularity((ipc_port_t) object, 
+                                               (ipc_port_t) remote)) {
+                          kmsg->ikm_header->msgh_bits |= 
+                                       MACH_MSGH_BITS_CIRCULAR;
+                      }
+                   }
+                   break;
+               }
+               case MACH_MSG_OOL_VOLATILE_DESCRIPTOR:
+        case MACH_MSG_OOL_DESCRIPTOR: {
+                   /* The sender should supply ready-made memory, i.e. a vm_map_copy_t
+             * so we don't need to do anything special. */
+
+                   mach_msg_ool_descriptor32_t *source_dsc = &saddr->out_of_line32;
+                   mach_msg_ool_descriptor_t   *dest_dsc = (typeof(dest_dsc))&daddr->out_of_line;
+
+            vm_offset_t                    address = source_dsc->address;
+            vm_size_t                          size = source_dsc->size;
+            boolean_t                          deallocate = source_dsc->deallocate;
+            mach_msg_copy_options_t            copy = source_dsc->copy;
+            mach_msg_descriptor_type_t  type = source_dsc->type;
+
+            dest_dsc->address = (void *)address;
+            dest_dsc->size = size;
+            dest_dsc->deallocate = deallocate;
+            dest_dsc->copy = copy;
+            dest_dsc->type = type;
+                   break;
+               }
+        case MACH_MSG_OOL_PORTS_DESCRIPTOR: {
+                   ipc_object_t                        *objects;
+                   unsigned int                        j;
+                   mach_msg_type_name_t                name;
+                   mach_msg_ool_ports_descriptor_t     *dest_dsc;
+               
+                   mach_msg_ool_ports_descriptor32_t   *source_dsc = &saddr->ool_ports32;
+            dest_dsc = (typeof(dest_dsc))&daddr->ool_ports;
+
+            boolean_t deallocate = source_dsc->deallocate;
+            mach_msg_copy_options_t copy = source_dsc->copy;
+            mach_msg_size_t port_count = source_dsc->count;
+            mach_msg_type_name_t disposition = source_dsc->disposition;
+
+                   /* this is really the type SEND, SEND_ONCE, etc. */
+                   name = disposition;
+                   disposition = ipc_object_copyin_type(name);
+               
+                   objects = (ipc_object_t *) (uintptr_t)source_dsc->address;
+               
+                   for ( j = 0; j < port_count; j++) {
+                       ipc_object_t object = objects[j];
+                       
+                       if (!IO_VALID(object))
+                           continue;
+                       
+                       ipc_object_copyin_from_kernel(object, name);
+    
+                       if ((disposition == MACH_MSG_TYPE_PORT_RECEIVE) &&
+                           ipc_port_check_circularity(
+                                                      (ipc_port_t) object,
+                                                      (ipc_port_t) remote))
+                           kmsg->ikm_header->msgh_bits |= MACH_MSGH_BITS_CIRCULAR;
+                   }
+
+            dest_dsc->address = objects;
+            dest_dsc->deallocate = deallocate;
+            dest_dsc->copy = copy;
+            dest_dsc->disposition = disposition;
+            dest_dsc->type = MACH_MSG_OOL_PORTS_DESCRIPTOR;
+            dest_dsc->count = port_count;
+                   break;
+               }
+               default: {
+#if    MACH_ASSERT
+                   panic("ipc_kmsg_copyin_from_kernel:  bad descriptor");
+#endif /* MACH_ASSERT */
+               }
+           }
+       }
+    }
+    return MACH_MSG_SUCCESS;
+}
+#endif /* IKM_SUPPORT_LEGACY */
+
+/*
+ *     Routine:        ipc_kmsg_copyout_header
+ *     Purpose:
+ *             "Copy-out" port rights in the header of a message.
+ *             Operates atomically; if it doesn't succeed the
+ *             message header and the space are left untouched.
+ *             If it does succeed the remote/local port fields
+ *             contain port names instead of object pointers,
+ *             and the bits field is updated.
+ *     Conditions:
+ *             Nothing locked.
+ *     Returns:
+ *             MACH_MSG_SUCCESS        Copied out port rights.
+ *             MACH_RCV_INVALID_NOTIFY 
+ *                     Notify is non-null and doesn't name a receive right.
+ *                     (Either KERN_INVALID_NAME or KERN_INVALID_RIGHT.)
+ *             MACH_RCV_HEADER_ERROR|MACH_MSG_IPC_SPACE
+ *                     The space is dead.
+ *             MACH_RCV_HEADER_ERROR|MACH_MSG_IPC_SPACE
  *                     No room in space for another name.
  *             MACH_RCV_HEADER_ERROR|MACH_MSG_IPC_KERNEL
  *                     Couldn't allocate memory for the reply port.
@@ -2046,220 +3614,198 @@ ipc_kmsg_copyin_from_kernel(
 
 mach_msg_return_t
 ipc_kmsg_copyout_header(
-       mach_msg_header_t       *msg,
+       ipc_kmsg_t              kmsg,
        ipc_space_t             space,
-       mach_port_name_t        notify)
+       mach_msg_option_t       option)
 {
+       mach_msg_header_t *msg = kmsg->ikm_header;
        mach_msg_bits_t mbits = msg->msgh_bits;
        ipc_port_t dest = (ipc_port_t) msg->msgh_remote_port;
 
        assert(IP_VALID(dest));
 
+       /*
+        * While we still hold a reference on the received-from port,
+        * process all send-possible notfications we received along with
+        * the message.
+        */
+       ipc_port_spnotify(dest);
+
     {
        mach_msg_type_name_t dest_type = MACH_MSGH_BITS_REMOTE(mbits);
        mach_msg_type_name_t reply_type = MACH_MSGH_BITS_LOCAL(mbits);
-       ipc_port_t reply = (ipc_port_t) msg->msgh_local_port;
+       mach_msg_type_name_t voucher_type = MACH_MSGH_BITS_VOUCHER(mbits);
+       ipc_port_t reply = msg->msgh_local_port;
+       ipc_port_t release_reply_port = IP_NULL;
        mach_port_name_t dest_name, reply_name;
 
+       ipc_port_t voucher = kmsg->ikm_voucher;
+       ipc_port_t release_voucher_port = IP_NULL;
+       mach_port_name_t voucher_name;
+
+       uint32_t entries_held = 0;
+       boolean_t need_write_lock = FALSE;
+       kern_return_t kr;
+
+       /*
+        * Reserve any potentially needed entries in the target space.
+        * We'll free any unused before unlocking the space.
+        */
        if (IP_VALID(reply)) {
-               ipc_port_t notify_port;
-               ipc_entry_t entry;
-               kern_return_t kr;
+               entries_held++;
+               need_write_lock = TRUE;
+       }
+       if (IP_VALID(voucher)) {
+               assert(voucher_type == MACH_MSG_TYPE_MOVE_SEND); 
 
-               /*
-                *      Handling notify (for MACH_RCV_NOTIFY) is tricky.
-                *      The problem is atomically making a send-once right
-                *      from the notify port and installing it for a
-                *      dead-name request in the new entry, because this
-                *      requires two port locks (on the notify port and
-                *      the reply port).  However, we can safely make
-                *      and consume send-once rights for the notify port
-                *      as long as we hold the space locked.  This isn't
-                *      an atomicity problem, because the only way
-                *      to detect that a send-once right has been created
-                *      and then consumed if it wasn't needed is by getting
-                *      at the receive right to look at ip_sorights, and
-                *      because the space is write-locked status calls can't
-                *      lookup the notify port receive right.  When we make
-                *      the send-once right, we lock the notify port,
-                *      so any status calls in progress will be done.
-                */
+               if ((option & MACH_RCV_VOUCHER) != 0)
+                       entries_held++;
+               need_write_lock = TRUE;
+       }
 
-               is_write_lock(space);
+       if (need_write_lock) {
 
-               for (;;) {
-                       ipc_port_request_index_t request;
+               is_write_lock(space);
 
-                       if (!space->is_active) {
+               while(entries_held) {
+                       if (!is_active(space)) {
                                is_write_unlock(space);
                                return (MACH_RCV_HEADER_ERROR|
                                        MACH_MSG_IPC_SPACE);
                        }
-
-                       if (notify != MACH_PORT_NULL) {
-                               notify_port = ipc_port_lookup_notify(space,
-                                                                    notify);
-                               if (notify_port == IP_NULL) {
-                                       is_write_unlock(space);
-                                       return MACH_RCV_INVALID_NOTIFY;
-                               }
-                       } else
-                               notify_port = IP_NULL;
-
-                       if ((reply_type != MACH_MSG_TYPE_PORT_SEND_ONCE) &&
-                           ipc_right_reverse(space, (ipc_object_t) reply,
-                                             &reply_name, &entry)) {
-                               /* reply port is locked and active */
-
-                               /*
-                                *      We don't need the notify_port
-                                *      send-once right, but we can't release
-                                *      it here because reply port is locked.
-                                *      Wait until after the copyout to
-                                *      release the notify port right.
-                                */
-
-                               assert(entry->ie_bits &
-                                      MACH_PORT_TYPE_SEND_RECEIVE);
+                               
+                       kr = ipc_entries_hold(space, entries_held);
+                       if (KERN_SUCCESS == kr)
                                break;
-                       }
 
-                       ip_lock(reply);
-                       if (!ip_active(reply)) {
-                               ip_release(reply);
-                               ip_check_unlock(reply);
-
-                               if (notify_port != IP_NULL)
-                                       ipc_port_release_sonce(notify_port);
-
-                               ip_lock(dest);
-                               is_write_unlock(space);
+                       kr = ipc_entry_grow_table(space, ITS_SIZE_NONE);
+                       if (KERN_SUCCESS != kr)
+                               return(MACH_RCV_HEADER_ERROR|
+                                      MACH_MSG_IPC_SPACE);
+                       /* space was unlocked and relocked - retry */
+               }
 
-                               reply = IP_DEAD;
-                               reply_name = MACH_PORT_DEAD;
-                               goto copyout_dest;
-                       }
+               /* Handle reply port. */
+               if (IP_VALID(reply)) {
+                       ipc_entry_t entry;
 
-                       reply_name = (mach_port_name_t)reply;
-                       kr = ipc_entry_get(space, &reply_name, &entry);
-                       if (kr != KERN_SUCCESS) {
-                               ip_unlock(reply);
-
-                               if (notify_port != IP_NULL)
-                                       ipc_port_release_sonce(notify_port);
-
-                               /* space is locked */
-                               kr = ipc_entry_grow_table(space,
-                                                         ITS_SIZE_NONE);
-                               if (kr != KERN_SUCCESS) {
-                                       /* space is unlocked */
-
-                                       if (kr == KERN_RESOURCE_SHORTAGE)
-                                               return (MACH_RCV_HEADER_ERROR|
-                                                       MACH_MSG_IPC_KERNEL);
-                                       else
-                                               return (MACH_RCV_HEADER_ERROR|
-                                                       MACH_MSG_IPC_SPACE);
+                       /* Is there already an entry we can use? */
+                       if ((reply_type != MACH_MSG_TYPE_PORT_SEND_ONCE) &&
+                           ipc_right_reverse(space, (ipc_object_t) reply, &reply_name, &entry)) {
+                               /* reply port is locked and active */
+                               assert(entry->ie_bits & MACH_PORT_TYPE_SEND_RECEIVE);
+                       } else {
+                               ip_lock(reply);
+                               if (!ip_active(reply)) {
+                                       ip_unlock(reply);
+                                       
+                                       release_reply_port = reply;
+                                       reply = IP_DEAD;
+                                       reply_name = MACH_PORT_DEAD;
+                                       goto done_with_reply;
                                }
-                               /* space is locked again; start over */
-
-                               continue;
-                       }
-                       assert(IE_BITS_TYPE(entry->ie_bits) ==
-                              MACH_PORT_TYPE_NONE);
-                       assert(entry->ie_object == IO_NULL); 
-
-                       if (notify_port == IP_NULL) {
-                               /* not making a dead-name request */
-
+                               
+                               /* claim a held entry for the reply port */
+                               assert(entries_held > 0);
+                               entries_held--;
+                               ipc_entry_claim(space, &reply_name, &entry);
+                               assert(IE_BITS_TYPE(entry->ie_bits) == MACH_PORT_TYPE_NONE);
+                               assert(entry->ie_object == IO_NULL); 
                                entry->ie_object = (ipc_object_t) reply;
-                               break;
                        }
 
-                       kr = ipc_port_dnrequest(reply, reply_name,
-                                               notify_port, &request);
-                       if (kr != KERN_SUCCESS) {
-                               ip_unlock(reply);
+                       /* space and reply port are locked and active */
+                       ip_reference(reply);    /* hold onto the reply port */
 
-                               ipc_port_release_sonce(notify_port);
+                       kr = ipc_right_copyout(space, reply_name, entry,
+                                              reply_type, TRUE, (ipc_object_t) reply);
+                       assert(kr == KERN_SUCCESS);
+                       /* reply port is unlocked */
+               } else
+                       reply_name = CAST_MACH_PORT_TO_NAME(reply);
 
-                               ipc_entry_dealloc(space, reply_name, entry);
-                               is_write_unlock(space);
+       done_with_reply:
 
-                               ip_lock(reply);
-                               if (!ip_active(reply)) {
-                                       /* will fail next time around loop */
+               /* Handle voucher port. */
+               if (voucher_type != MACH_MSGH_BITS_ZERO) {
+                       assert(voucher_type == MACH_MSG_TYPE_MOVE_SEND);
 
-                                       ip_unlock(reply);
-                                       is_write_lock(space);
-                                       continue;
+                       if (!IP_VALID(voucher)) {
+                               if ((option & MACH_RCV_VOUCHER) == 0) {
+                                       voucher_type = MACH_MSGH_BITS_ZERO;
                                }
-
-                               kr = ipc_port_dngrow(reply, ITS_SIZE_NONE);
-                               /* port is unlocked */
-                               if (kr != KERN_SUCCESS)
-                                       return (MACH_RCV_HEADER_ERROR|
-                                               MACH_MSG_IPC_KERNEL);
-
-                               is_write_lock(space);
-                               continue;
+                               voucher_name = MACH_PORT_NULL;
+                               goto done_with_voucher;
                        }
-
-                       notify_port = IP_NULL; /* don't release right below */
-
-                       entry->ie_object = (ipc_object_t) reply;
-                       entry->ie_request = request;
-                       break;
+                       
+                       /* clear voucher from its hiding place back in the kmsg */
+                       kmsg->ikm_voucher = IP_NULL;
+
+                       if ((option & MACH_RCV_VOUCHER) != 0) {
+                               ipc_entry_t entry;
+
+                               if (ipc_right_reverse(space, (ipc_object_t) voucher,
+                                                     &voucher_name, &entry)) {
+                                       /* voucher port locked */
+                                       assert(entry->ie_bits & MACH_PORT_TYPE_SEND);
+                               } else {
+                                       assert(entries_held > 0);
+                                       entries_held--;
+                                       ipc_entry_claim(space, &voucher_name, &entry);
+                                       assert(IE_BITS_TYPE(entry->ie_bits) == MACH_PORT_TYPE_NONE);
+                                       assert(entry->ie_object == IO_NULL); 
+                                       entry->ie_object = (ipc_object_t) voucher;
+                                       ip_lock(voucher);
+                               }
+                               /* space is locked and active */
+
+                               assert(ip_active(voucher));
+                               assert(ip_kotype(voucher) == IKOT_VOUCHER);
+                               kr = ipc_right_copyout(space, voucher_name, entry,
+                                                      MACH_MSG_TYPE_MOVE_SEND, TRUE, 
+                                                      (ipc_object_t) voucher);
+                               /* voucher port is unlocked */
+                       } else {
+                               voucher_type = MACH_MSGH_BITS_ZERO;
+                               release_voucher_port = voucher;
+                               voucher_name = MACH_PORT_NULL;
+                       }
+               } else {
+                       voucher_name = msg->msgh_voucher_port;
                }
 
-               /* space and reply port are locked and active */
-
-               ip_reference(reply);    /* hold onto the reply port */
-
-               kr = ipc_right_copyout(space, reply_name, entry,
-                                      reply_type, TRUE, (ipc_object_t) reply);
-               /* reply port is unlocked */
-               assert(kr == KERN_SUCCESS);
-
-               if (notify_port != IP_NULL)
-                       ipc_port_release_sonce(notify_port);
+       done_with_voucher:
 
                ip_lock(dest);
                is_write_unlock(space);
+
        } else {
                /*
-                *      No reply port!  This is an easy case.
+                *      No reply or voucher port!  This is an easy case.
                 *      We only need to have the space locked
-                *      when checking notify and when locking
-                *      the destination (to ensure atomicity).
+                *      when locking the destination.
                 */
 
                is_read_lock(space);
-               if (!space->is_active) {
+               if (!is_active(space)) {
                        is_read_unlock(space);
                        return MACH_RCV_HEADER_ERROR|MACH_MSG_IPC_SPACE;
                }
 
-               if (notify != MACH_PORT_NULL) {
-                       ipc_entry_t entry;
+               ip_lock(dest);
+               is_read_unlock(space);
 
-                       /* must check notify even though it won't be used */
+               reply_name = CAST_MACH_PORT_TO_NAME(reply);
 
-                       if ((entry = ipc_entry_lookup(space, notify)) == IE_NULL) {
-                               is_read_unlock(space);
-                               return MACH_RCV_INVALID_NOTIFY;
-                       }
-       
-                       if ((entry->ie_bits & MACH_PORT_TYPE_RECEIVE) == 0) {
-                               is_read_unlock(space);
-                               return MACH_RCV_INVALID_NOTIFY;
+               if (voucher_type != MACH_MSGH_BITS_ZERO) {
+                       assert(voucher_type == MACH_MSG_TYPE_MOVE_SEND);
+                       if ((option & MACH_RCV_VOUCHER) == 0) {
+                               voucher_type = MACH_MSGH_BITS_ZERO;
                        }
+                       voucher_name = MACH_PORT_NULL;
+               } else {
+                       voucher_name = msg->msgh_voucher_port;
                }
-
-               ip_lock(dest);
-               is_read_unlock(space);
-
-               reply_name = (mach_port_name_t) reply;
        }
 
        /*
@@ -2309,18 +3855,17 @@ ipc_kmsg_copyout_header(
         *      is done correctly.
         */
 
-    copyout_dest:
-
        if (ip_active(dest)) {
                ipc_object_copyout_dest(space, (ipc_object_t) dest,
                                        dest_type, &dest_name);
                /* dest is unlocked */
+
        } else {
                ipc_port_timestamp_t timestamp;
 
                timestamp = dest->ip_timestamp;
+               ip_unlock(dest);
                ip_release(dest);
-               ip_check_unlock(dest);
 
                if (IP_VALID(reply)) {
                        ip_lock(reply);
@@ -2336,15 +3881,43 @@ ipc_kmsg_copyout_header(
        }
 
        if (IP_VALID(reply))
-               ipc_port_release(reply);
+               ip_release(reply);
+
+       if (IP_VALID(release_reply_port)) {
+               if (reply_type == MACH_MSG_TYPE_PORT_SEND_ONCE)
+                       ipc_port_release_sonce(release_reply_port);
+               else
+                       ipc_port_release_send(release_reply_port);
+       }
 
-       msg->msgh_bits = (MACH_MSGH_BITS_OTHER(mbits) |
-                         MACH_MSGH_BITS(reply_type, dest_type));
-       msg->msgh_local_port = (ipc_port_t)dest_name;
-       msg->msgh_remote_port = (ipc_port_t)reply_name;
+       if (IP_VALID(release_voucher_port))
+               ipc_port_release_send(release_voucher_port);
+
+
+       if ((option & MACH_RCV_VOUCHER) != 0) {
+           KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_IPC, MACH_IPC_MSG_RECV) | DBG_FUNC_NONE,
+                                 VM_KERNEL_ADDRPERM((uintptr_t)kmsg),
+                                 (uintptr_t)kmsg->ikm_header->msgh_bits,
+                                 (uintptr_t)kmsg->ikm_header->msgh_id,
+                                 VM_KERNEL_ADDRPERM((uintptr_t)unsafe_convert_port_to_voucher(voucher)),
+                                 0);
+       } else {
+           KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_IPC, MACH_IPC_MSG_RECV_VOUCHER_REFUSED) | DBG_FUNC_NONE,
+                                 VM_KERNEL_ADDRPERM((uintptr_t)kmsg),
+                                 (uintptr_t)kmsg->ikm_header->msgh_bits,
+                                 (uintptr_t)kmsg->ikm_header->msgh_id,
+                                 VM_KERNEL_ADDRPERM((uintptr_t)unsafe_convert_port_to_voucher(voucher)),
+                                 0);
+       }
+
+       msg->msgh_bits = MACH_MSGH_BITS_SET(reply_type, dest_type,
+                                           voucher_type, mbits);
+       msg->msgh_local_port = CAST_MACH_NAME_TO_PORT(dest_name);
+       msg->msgh_remote_port = CAST_MACH_NAME_TO_PORT(reply_name);
+       msg->msgh_voucher_port = voucher_name;
     }
 
-       return MACH_MSG_SUCCESS;
+    return MACH_MSG_SUCCESS;
 }
 
 /*
@@ -2374,7 +3947,7 @@ ipc_kmsg_copyout_object(
        kern_return_t kr;
 
        if (!IO_VALID(object)) {
-               *namep = (mach_port_name_t) object;
+               *namep = CAST_MACH_PORT_TO_NAME(object);
                return MACH_MSG_SUCCESS;
        }
 
@@ -2397,360 +3970,381 @@ ipc_kmsg_copyout_object(
        return MACH_MSG_SUCCESS;
 }
 
-/*
- *     Routine:        ipc_kmsg_copyout_body
- *     Purpose:
- *             "Copy-out" port rights and out-of-line memory
- *             in the body of a message.
- *
- *             The error codes are a combination of special bits.
- *             The copyout proceeds despite errors.
- *     Conditions:
- *             Nothing locked.
- *     Returns:
- *             MACH_MSG_SUCCESS        Successful copyout.
- *             MACH_MSG_IPC_SPACE      No room for port right in name space.
- *             MACH_MSG_VM_SPACE       No room for memory in address space.
- *             MACH_MSG_IPC_KERNEL     Resource shortage handling port right.
- *             MACH_MSG_VM_KERNEL      Resource shortage handling memory.
- *             MACH_MSG_INVALID_RT_DESCRIPTOR Descriptor incompatible with RT
- */
-
-mach_msg_return_t
-ipc_kmsg_copyout_body(
-       ipc_kmsg_t              kmsg,
-       ipc_space_t             space,
-       vm_map_t                map,
-       mach_msg_body_t         *slist)
+mach_msg_descriptor_t *
+ipc_kmsg_copyout_port_descriptor(mach_msg_descriptor_t *dsc,
+        mach_msg_descriptor_t *user_dsc,
+        ipc_space_t space,
+        kern_return_t *mr);
+mach_msg_descriptor_t *
+ipc_kmsg_copyout_port_descriptor(mach_msg_descriptor_t *dsc,
+        mach_msg_descriptor_t *dest_dsc,
+        ipc_space_t space, 
+        kern_return_t *mr)
 {
-    mach_msg_body_t            *body;
-    mach_msg_descriptor_t      *daddr, *naddr;
-    mach_msg_descriptor_t      *saddr;
-    mach_msg_type_number_t     i, dsc_count, sdsc_count;
-    mach_msg_return_t          mr = MACH_MSG_SUCCESS;
-    kern_return_t              kr;
-    void                       *data;
-    boolean_t                  differs = MAP_SIZE_DIFFERS(map);
+    mach_port_t                        port;
+    mach_port_name_t           name;
+    mach_msg_type_name_t               disp;
 
-    body = (mach_msg_body_t *) (kmsg->ikm_header + 1);
-    dsc_count = body->msgh_descriptor_count;
-    daddr = (mach_msg_descriptor_t *) (body + 1);
 
-    /*
-     * Do scatter list setup
-     */
-    if (slist != MACH_MSG_BODY_NULL) {
-       saddr = (mach_msg_descriptor_t *) (slist + 1);
-       sdsc_count = slist->msgh_descriptor_count;
-    }
-    else {
-       saddr = MACH_MSG_DESCRIPTOR_NULL;
-       sdsc_count = 0;
+    /* Copyout port right carried in the message */
+    port = dsc->port.name;
+    disp = dsc->port.disposition;
+    *mr |= ipc_kmsg_copyout_object(space, 
+            (ipc_object_t)port, 
+            disp, 
+            &name);
+
+    if(current_task() == kernel_task)
+    {
+        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;
+        dest_dsc = (typeof(dest_dsc))user_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;
+        dest_dsc = (typeof(dest_dsc))user_dsc;
     }
 
-    /*
-     * Compute the true size of the resulting descriptors
-     * after potential expansion and adjust the header
-     * and body location accordingly.
-     */
-    if (differs) {
-       mach_msg_size_t dsc_adjust;
+    return (mach_msg_descriptor_t *)dest_dsc;
+}
 
-       naddr = daddr;
-       dsc_adjust = 0;
-       for (i = 0; i < dsc_count; i++, naddr++)
-           switch (naddr->type.type) {
-           case MACH_MSG_OOL_DESCRIPTOR:
-           case MACH_MSG_OOL_VOLATILE_DESCRIPTOR:
-           case MACH_MSG_OOL_PORTS_DESCRIPTOR:
-               dsc_adjust += DESC_SIZE_ADJUSTMENT;
-               break;
-           default:
-               break;
-           }
-       if (dsc_adjust) {
-           mach_msg_base_t *old_base = (mach_msg_base_t *)kmsg->ikm_header;
-           mach_msg_base_t *new_base;
-
-           new_base = (mach_msg_base_t *)((vm_offset_t)old_base - dsc_adjust);
-           memmove(new_base, old_base, sizeof(mach_msg_base_t));
-           kmsg->ikm_header = &new_base->header;
-           kmsg->ikm_header->msgh_size += dsc_adjust;
-           naddr = (mach_msg_descriptor_t *)(new_base + 1);
-       } else {
-           naddr = daddr;
-       }
+mach_msg_descriptor_t *
+ipc_kmsg_copyout_ool_descriptor(mach_msg_ool_descriptor_t *dsc, mach_msg_descriptor_t *user_dsc, int is_64bit, vm_map_t map, mach_msg_return_t *mr);
+mach_msg_descriptor_t *
+ipc_kmsg_copyout_ool_descriptor(mach_msg_ool_descriptor_t *dsc, mach_msg_descriptor_t *user_dsc, int is_64bit, vm_map_t map, mach_msg_return_t *mr)
+{
+    vm_map_copy_t                      copy;
+    vm_map_address_t                   rcv_addr;
+    mach_msg_copy_options_t            copy_options;
+    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 = (vm_map_size_t)dsc->size;
+    copy_options = dsc->copy;
+    assert(copy_options != MACH_MSG_KALLOC_COPY_T);
+    dsc_type = dsc->type;
+
+    if (copy != VM_MAP_COPY_NULL) {
+       kern_return_t kr;
+
+        rcv_addr = 0;
+       if (vm_map_copy_validate_size(map, copy, &size) == FALSE)
+               panic("Inconsistent OOL/copyout size on %p: expected %d, got %lld @%p",
+                     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;
+            else
+                *mr |= MACH_MSG_VM_SPACE;
+            vm_map_copy_discard(copy);
+            rcv_addr = 0;
+            size = 0;
+        }
     } else {
-       naddr = daddr;
+        rcv_addr = 0;
+        size = 0;
     }
 
     /*
-     * Now process the descriptors
+     * Now update the descriptor as the user would see it.
+     * This may require expanding the descriptor to the user
+     * visible size.  There is already space allocated for
+     * this in what naddr points to.
      */
-    for ( i = 0; i < dsc_count; i++, daddr++ ) {
-       switch (daddr->type.type) {
-           
-           case MACH_MSG_PORT_DESCRIPTOR: {
-               volatile mach_msg_port_descriptor_t *dsc;
-               volatile mach_msg_port_descriptor_t *user_dsc;
-               mach_port_t                     port;
-               mach_port_name_t                name;
-               mach_msg_type_name_t            disp;
-               
-               /* 
-                * Copyout port right carried in the message 
-                */
-               dsc = &daddr->port;
-               user_dsc = &naddr->port;
-               port = dsc->name;
-               disp = dsc->disposition;
-               mr |= ipc_kmsg_copyout_object(space, 
-                                             (ipc_object_t)port, 
-                                             disp, 
-                                             &name);
-               user_dsc->name = (mach_port_t)name;
-               user_dsc->disposition = disp;
-               user_dsc->type = MACH_MSG_PORT_DESCRIPTOR;
-               naddr++;
-               break;
-           }
-
-           case MACH_MSG_OOL_VOLATILE_DESCRIPTOR:
-           case MACH_MSG_OOL_DESCRIPTOR : {
-               vm_map_copy_t                   copy;
-               mach_vm_offset_t                rcv_addr;
-               mach_msg_ool_descriptor_t       *dsc;
-               mach_msg_copy_options_t         copy_options;
-               mach_msg_size_t                 size;
-               mach_msg_descriptor_type_t      dsc_type;
-
-               SKIP_PORT_DESCRIPTORS(saddr, sdsc_count);
-
-               dsc = &daddr->out_of_line;
-               copy = (vm_map_copy_t) dsc->address;
-               size = dsc->size;
-               copy_options = dsc->copy;
-               assert(copy_options != MACH_MSG_KALLOC_COPY_T);
-               dsc_type = dsc->type;
-
-               if (copy != VM_MAP_COPY_NULL) {
-                   /*
-                    * Check to see if there is an overwrite descriptor
-                    * specified in the scatter list for this ool data.
-                    * The descriptor has already been verified.
-                    */
-                   if (saddr != MACH_MSG_DESCRIPTOR_NULL) {
-                       if (differs) {
-                           OTHER_OOL_DESCRIPTOR *scatter_dsc;
-
-                           scatter_dsc = (OTHER_OOL_DESCRIPTOR *)saddr;
-                           if (scatter_dsc->copy == MACH_MSG_OVERWRITE) {
-                               rcv_addr = (mach_vm_offset_t) scatter_dsc->address;
-                               copy_options = MACH_MSG_OVERWRITE;
-                           } else {
-                               rcv_addr = 0;
-                               copy_options = MACH_MSG_VIRTUAL_COPY;
-                           }
-                       } else {
-                           mach_msg_ool_descriptor_t *scatter_dsc;
-
-                           scatter_dsc = &saddr->out_of_line;
-                           if (scatter_dsc->copy == MACH_MSG_OVERWRITE) {
-                               rcv_addr = CAST_USER_ADDR_T(scatter_dsc->address);
-                               copy_options = MACH_MSG_OVERWRITE;
-                           } else {
-                               rcv_addr = 0;
-                               copy_options = MACH_MSG_VIRTUAL_COPY;
-                           }
-                       }
-                       INCREMENT_SCATTER(saddr, sdsc_count, differs);
-                   }
-
-
-                   /*
-                    * Whether the data was virtually or physically
-                    * copied we have a vm_map_copy_t for it.
-                    * If there's an overwrite region specified
-                    * overwrite it, otherwise do a virtual copy out.
-                    */
-                   if (copy_options == MACH_MSG_OVERWRITE) {
-                           kr = vm_map_copy_overwrite(map, rcv_addr,
-                                           copy, TRUE);
-                   } else {
-                           kr = vm_map_copyout(map, &rcv_addr, copy);
-                   }   
-                   if (kr != KERN_SUCCESS) {
-                           if (kr == KERN_RESOURCE_SHORTAGE)
-                                   mr |= MACH_MSG_VM_KERNEL;
-                           else
-                                   mr |= MACH_MSG_VM_SPACE;
-                           vm_map_copy_discard(copy);
-                           rcv_addr = 0;
-                           size = 0;
-                   }
-               } else {
-                   rcv_addr = 0;
-                   size = 0;
-               }
+    if(current_task() == kernel_task)
+    {
+        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 = (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 = (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 = (mach_msg_size_t)size;
+        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_dsc = (typeof(user_dsc))user_ool_dsc;
+    }
+    return user_dsc;
+}
 
-               /*
-                * Now update the descriptor as the user would see it.
-                * This may require expanding the descriptor to the user
-                * visible size.  There is already space allocated for
-                * this in what naddr points to.
-                */
-               if (differs) {
-                   volatile OTHER_OOL_DESCRIPTOR *user_dsc;
-                   
-                   user_dsc = (OTHER_OOL_DESCRIPTOR *)naddr;
-                   user_dsc->address = rcv_addr;
-                   user_dsc->deallocate = (copy_options == MACH_MSG_VIRTUAL_COPY) ?
-                                          TRUE : FALSE;
-                   user_dsc->copy = copy_options;
-                   user_dsc->type = dsc_type;
-                   user_dsc->size = size;
-                   naddr = (mach_msg_descriptor_t *)((OTHER_OOL_DESCRIPTOR *)naddr + 1);
-               } else {
-                   volatile mach_msg_ool_descriptor_t *user_dsc;
-                   
-                   user_dsc = &naddr->out_of_line;
-                   user_dsc->address = CAST_DOWN(void *, rcv_addr);
-                   user_dsc->size = size;
-                   user_dsc->deallocate = (copy_options == MACH_MSG_VIRTUAL_COPY) ?
-                                          TRUE : FALSE;
-                   user_dsc->copy = copy_options;
-                   user_dsc->type = dsc_type;
-                   naddr++;
-               }
-               break;
-           }
+mach_msg_descriptor_t *
+ipc_kmsg_copyout_ool_ports_descriptor(mach_msg_ool_ports_descriptor_t *dsc,
+        mach_msg_descriptor_t *user_dsc,
+        int is_64bit,
+        vm_map_t map,
+        ipc_space_t space,
+        ipc_kmsg_t kmsg,
+        mach_msg_return_t *mr);
+mach_msg_descriptor_t *
+ipc_kmsg_copyout_ool_ports_descriptor(mach_msg_ool_ports_descriptor_t *dsc,
+        mach_msg_descriptor_t *user_dsc,
+        int is_64bit,
+        vm_map_t map,
+        ipc_space_t space,
+        ipc_kmsg_t kmsg,
+        mach_msg_return_t *mr)
+{
+    mach_vm_offset_t           rcv_addr = 0;
+    mach_msg_type_name_t               disp;
+    mach_msg_type_number_t             count, i;
+    vm_size_t                          ports_length, names_length;
+
+    mach_msg_copy_options_t copy_options = MACH_MSG_VIRTUAL_COPY;
+
+    //SKIP_PORT_DESCRIPTORS(saddr, sdsc_count);
+
+    count = dsc->count;
+    disp = dsc->disposition;
+    ports_length = count * sizeof(mach_port_t);
+    names_length = count * sizeof(mach_port_name_t);
+
+    if (ports_length != 0 && dsc->address != 0) {
+
+        /*
+         * Check to see if there is an overwrite descriptor
+         * specified in the scatter list for this ool data.
+         * The descriptor has already been verified.
+         */
+#if 0
+        if (saddr != MACH_MSG_DESCRIPTOR_NULL) {
+            if (differs) {
+                OTHER_OOL_DESCRIPTOR *scatter_dsc;
+
+                scatter_dsc = (OTHER_OOL_DESCRIPTOR *)saddr;
+                rcv_addr = (mach_vm_offset_t) scatter_dsc->address;
+                copy_options = scatter_dsc->copy;
+            } else {
+                mach_msg_ool_descriptor_t *scatter_dsc;
+
+                scatter_dsc = &saddr->out_of_line;
+                rcv_addr = CAST_USER_ADDR_T(scatter_dsc->address);
+                copy_options = scatter_dsc->copy;
+            }
+            INCREMENT_SCATTER(saddr, sdsc_count, differs);
+        }
+#endif
 
-           case MACH_MSG_OOL_PORTS_DESCRIPTOR : {
-               mach_vm_offset_t                rcv_addr;
-               mach_port_name_t                *objects;
-               mach_msg_type_name_t            disp;
-               mach_msg_type_number_t          count, j;
-               vm_size_t                       length;
+        if (copy_options == MACH_MSG_VIRTUAL_COPY) {
+            /*
+             * Dynamically allocate the region
+             */
+            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_kernel(map, &rcv_addr,
+                            (mach_vm_size_t)names_length,
+                            VM_FLAGS_ANYWHERE, tag)) != KERN_SUCCESS) {
+                ipc_kmsg_clean_body(kmsg, 1, (mach_msg_descriptor_t *)dsc);
+                rcv_addr = 0;
+
+                if (kr == KERN_RESOURCE_SHORTAGE){
+                    *mr |= MACH_MSG_VM_KERNEL;
+                } else {
+                    *mr |= MACH_MSG_VM_SPACE;
+                }
+            }
+        }
 
-               volatile mach_msg_ool_ports_descriptor_t        *dsc;
-               mach_msg_copy_options_t copy_options = MACH_MSG_VIRTUAL_COPY;
+        /*
+         * Handle the port rights and copy out the names
+         * for those rights out to user-space.
+         */
+        if (rcv_addr != 0) {
+            mach_port_t *objects = (mach_port_t *) dsc->address;
+            mach_port_name_t *names = (mach_port_name_t *) dsc->address;
 
-               SKIP_PORT_DESCRIPTORS(saddr, sdsc_count);
+            /* copyout port rights carried in the message */
 
-               dsc = &daddr->ool_ports;
-               count = dsc->count;
-               disp = dsc->disposition;
-               length = count * sizeof(mach_port_name_t);
+            for ( i = 0; i < count ; i++) {
+                ipc_object_t object = (ipc_object_t)objects[i];
 
-               if (length != 0 && dsc->address != 0) {
+                *mr |= ipc_kmsg_copyout_object(space, object,
+                        disp, &names[i]);
+            }
 
-                   /*
-                    * Check to see if there is an overwrite descriptor
-                    * specified in the scatter list for this ool data.
-                    * The descriptor has already been verified.
-                    */
-                   if (saddr != MACH_MSG_DESCRIPTOR_NULL) {
-                       if (differs) {
-                           OTHER_OOL_DESCRIPTOR *scatter_dsc;
+            /* copyout to memory allocated above */
+            void *data = dsc->address;
+            if (copyoutmap(map, data, rcv_addr, names_length) != KERN_SUCCESS)
+                *mr |= MACH_MSG_VM_SPACE;
+            kfree(data, ports_length);
+        }
+    } else {
+        rcv_addr = 0;
+    }
 
-                           scatter_dsc = (OTHER_OOL_DESCRIPTOR *)saddr;
-                           rcv_addr = (mach_vm_offset_t) scatter_dsc->address;
-                           copy_options = scatter_dsc->copy;
-                       } else {
-                           mach_msg_ool_descriptor_t *scatter_dsc;
+    /*
+     * Now update the descriptor based on the information
+     * calculated above.
+     */
+    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) ?
+            TRUE : FALSE;
+        user_ool_dsc->copy = copy_options;
+        user_ool_dsc->disposition = disp;
+        user_ool_dsc->type = MACH_MSG_OOL_PORTS_DESCRIPTOR;
+        user_ool_dsc->count = count;
+
+        user_dsc = (typeof(user_dsc))user_ool_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) ?
+            TRUE : FALSE;
+        user_ool_dsc->copy = copy_options;
+        user_ool_dsc->disposition = disp;
+        user_ool_dsc->type = MACH_MSG_OOL_PORTS_DESCRIPTOR;
+        user_ool_dsc->count = count;
+
+        user_dsc = (typeof(user_dsc))user_ool_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;
+        user_ool_dsc->deallocate = (copy_options == MACH_MSG_VIRTUAL_COPY) ?
+            TRUE : FALSE;
+        user_ool_dsc->copy = copy_options;
+        user_ool_dsc->disposition = disp;
+        user_ool_dsc->type = MACH_MSG_OOL_PORTS_DESCRIPTOR;
+
+        user_dsc = (typeof(user_dsc))user_ool_dsc;
+    }
+    return user_dsc;
+}
 
-                           scatter_dsc = &saddr->out_of_line;
-                           rcv_addr = CAST_USER_ADDR_T(scatter_dsc->address);
-                           copy_options = scatter_dsc->copy;
-                       }
-                       INCREMENT_SCATTER(saddr, sdsc_count, differs);
-                   }
+/*
+ *     Routine:        ipc_kmsg_copyout_body
+ *     Purpose:
+ *             "Copy-out" port rights and out-of-line memory
+ *             in the body of a message.
+ *
+ *             The error codes are a combination of special bits.
+ *             The copyout proceeds despite errors.
+ *     Conditions:
+ *             Nothing locked.
+ *     Returns:
+ *             MACH_MSG_SUCCESS        Successful copyout.
+ *             MACH_MSG_IPC_SPACE      No room for port right in name space.
+ *             MACH_MSG_VM_SPACE       No room for memory in address space.
+ *             MACH_MSG_IPC_KERNEL     Resource shortage handling port right.
+ *             MACH_MSG_VM_KERNEL      Resource shortage handling memory.
+ *             MACH_MSG_INVALID_RT_DESCRIPTOR Descriptor incompatible with RT
+ */
 
-                   if (copy_options == MACH_MSG_VIRTUAL_COPY) {
-                       /*
-                        * Dynamically allocate the region
-                        */
-                       int anywhere = VM_MAKE_TAG(VM_MEMORY_MACH_MSG)|
-                                      VM_FLAGS_ANYWHERE;
-
-                       if ((kr = mach_vm_allocate(map, &rcv_addr, 
-                                             (mach_vm_size_t)length,
-                                             anywhere)) != KERN_SUCCESS) {
-                           ipc_kmsg_clean_body(kmsg, 1, daddr);
-                           rcv_addr = 0;
-
-                           if (kr == KERN_RESOURCE_SHORTAGE){
-                               mr |= MACH_MSG_VM_KERNEL;
-                           } else {
-                               mr |= MACH_MSG_VM_SPACE;
-                           }
-                       }
-                   }
+mach_msg_return_t
+ipc_kmsg_copyout_body(
+       ipc_kmsg_t              kmsg,
+       ipc_space_t             space,
+       vm_map_t                map,
+       mach_msg_body_t         *slist)
+{
+    mach_msg_body_t            *body;
+    mach_msg_descriptor_t      *kern_dsc, *user_dsc;
+    mach_msg_descriptor_t      *saddr;
+    mach_msg_type_number_t     dsc_count, sdsc_count;
+    int i;
+    mach_msg_return_t          mr = MACH_MSG_SUCCESS;
+    boolean_t                  is_task_64bit = (map->max_offset > VM_MAX_ADDRESS);
 
+    body = (mach_msg_body_t *) (kmsg->ikm_header + 1);
+    dsc_count = body->msgh_descriptor_count;
+    kern_dsc = (mach_msg_descriptor_t *) (body + 1);
+    /* Point user_dsc just after the end of all the descriptors */
+    user_dsc = &kern_dsc[dsc_count];
 
-                   /*
-                    * Handle the port rights and copy out the names
-                    * for those rights out to user-space.
-                    */
-                   if (rcv_addr != 0) {
-                       objects = (mach_port_name_t *) dsc->address ;
-               
-                       /* copyout port rights carried in the message */
-               
-                       for ( j = 0; j < count ; j++) {
-                           ipc_object_t object =
-                               (ipc_object_t) objects[j];
-                   
-                           mr |= ipc_kmsg_copyout_object(space, object,
-                                                         disp, &objects[j]);
-                       }
+    /* Do scatter list setup */
+    if (slist != MACH_MSG_BODY_NULL) {
+    panic("Scatter lists disabled");
+       saddr = (mach_msg_descriptor_t *) (slist + 1);
+       sdsc_count = slist->msgh_descriptor_count;
+    }
+    else {
+       saddr = MACH_MSG_DESCRIPTOR_NULL;
+       sdsc_count = 0;
+    }
 
-                       /* copyout to memory allocated above */
-                       data = dsc->address;
-                       if (copyoutmap(map, data, rcv_addr, length) != KERN_SUCCESS)
-                           mr |= MACH_MSG_VM_SPACE;
-                       kfree(data, length);
-                   }
-               } else {
-                   rcv_addr = 0;
-               }
+    /* Now process the descriptors */
+    for (i = dsc_count-1; i >= 0; i--) {
+        switch (kern_dsc[i].type.type) {
+
+            case MACH_MSG_PORT_DESCRIPTOR: 
+                user_dsc = ipc_kmsg_copyout_port_descriptor(&kern_dsc[i], user_dsc, space, &mr);
+                break;
+            case MACH_MSG_OOL_VOLATILE_DESCRIPTOR:
+            case MACH_MSG_OOL_DESCRIPTOR : 
+                user_dsc = ipc_kmsg_copyout_ool_descriptor(
+                        (mach_msg_ool_descriptor_t *)&kern_dsc[i], user_dsc, is_task_64bit, map, &mr);
+                break;
+            case MACH_MSG_OOL_PORTS_DESCRIPTOR : 
+                user_dsc = ipc_kmsg_copyout_ool_ports_descriptor(
+                        (mach_msg_ool_ports_descriptor_t *)&kern_dsc[i], user_dsc, is_task_64bit, map, space, kmsg, &mr);
+                break;
+            default : {
+                          panic("untyped IPC copyout body: invalid message descriptor");
+                      }
+        }
+    }
 
-               /*
-                * Now update the descriptor based on the information
-                * calculated above.
-                */
-               if (differs) {
-                   volatile OTHER_OOL_PORTS_DESCRIPTOR *user_dsc;
-                   
-                   user_dsc = (OTHER_OOL_PORTS_DESCRIPTOR *)naddr;
-                   user_dsc->address = rcv_addr;
-                   user_dsc->deallocate = (copy_options == MACH_MSG_VIRTUAL_COPY) ?
-                                          TRUE : FALSE;
-                   user_dsc->copy = copy_options;
-                   user_dsc->disposition = disp;
-                   user_dsc->type = MACH_MSG_OOL_PORTS_DESCRIPTOR;
-                   user_dsc->count = count;
-                   naddr = (mach_msg_descriptor_t *)((OTHER_OOL_PORTS_DESCRIPTOR *)naddr + 1);
-               } else {
-                   volatile mach_msg_ool_ports_descriptor_t *user_dsc;
-                   
-                   user_dsc = &naddr->ool_ports;
-                   user_dsc->address = CAST_DOWN(void *, rcv_addr);
-                   user_dsc->count = count;
-                   user_dsc->deallocate = (copy_options == MACH_MSG_VIRTUAL_COPY) ?
-                                          TRUE : FALSE;
-                   user_dsc->copy = copy_options;
-                   user_dsc->disposition = disp;
-                   user_dsc->type = MACH_MSG_OOL_PORTS_DESCRIPTOR;
-                   naddr++;
-               }
-               break;
-           }
-           default : {
-               panic("untyped IPC copyout body: invalid message descriptor");
-           }
-       }
+    if(user_dsc != kern_dsc) {
+        vm_offset_t dsc_adjust = (vm_offset_t)user_dsc - (vm_offset_t)kern_dsc;
+        memmove((char *)((vm_offset_t)kmsg->ikm_header + dsc_adjust), kmsg->ikm_header, sizeof(mach_msg_base_t));
+        kmsg->ikm_header = (mach_msg_header_t *)((vm_offset_t)kmsg->ikm_header + dsc_adjust);
+        /* Update the message size for the smaller user representation */
+        kmsg->ikm_header->msgh_size -= (mach_msg_size_t)dsc_adjust;
     }
+
     return mr;
 }
 
@@ -2772,35 +4366,42 @@ ipc_kmsg_copyout_size(
        ipc_kmsg_t              kmsg,
        vm_map_t                map)
 {
-       mach_msg_size_t         send_size;
+    mach_msg_size_t            send_size;
 
-       send_size = kmsg->ikm_header->msgh_size;
+    send_size = kmsg->ikm_header->msgh_size;
 
-       if ((kmsg->ikm_header->msgh_bits & MACH_MSGH_BITS_COMPLEX) &&
-           MAP_SIZE_DIFFERS(map)) {
+    boolean_t is_task_64bit = (map->max_offset > VM_MAX_ADDRESS);
 
-               mach_msg_body_t *body;
-               mach_msg_descriptor_t *saddr, *eaddr;
+#if defined(__LP64__)
+       send_size -= LEGACY_HEADER_SIZE_DELTA;
+#endif
 
-               body = (mach_msg_body_t *) (kmsg->ikm_header + 1);
-               saddr = (mach_msg_descriptor_t *) (body + 1);
-               eaddr = saddr + body->msgh_descriptor_count;
-               
-               for ( ; saddr < eaddr; saddr++ ) {
-                       switch (saddr->type.type) {
+    if (kmsg->ikm_header->msgh_bits & MACH_MSGH_BITS_COMPLEX) {
 
-                       case MACH_MSG_OOL_DESCRIPTOR:
-                       case MACH_MSG_OOL_VOLATILE_DESCRIPTOR:
-                       case MACH_MSG_OOL_PORTS_DESCRIPTOR:
-                               send_size += DESC_SIZE_ADJUSTMENT;
-                               break;
+        mach_msg_body_t *body;
+        mach_msg_descriptor_t *saddr, *eaddr;
 
-                       default:
-                               break;
-                       }
-               }
-       }
-       return send_size;
+        body = (mach_msg_body_t *) (kmsg->ikm_header + 1);
+        saddr = (mach_msg_descriptor_t *) (body + 1);
+        eaddr = saddr + body->msgh_descriptor_count;
+
+        for ( ; saddr < eaddr; saddr++ ) {
+            switch (saddr->type.type) {
+                case MACH_MSG_OOL_DESCRIPTOR:
+                case MACH_MSG_OOL_VOLATILE_DESCRIPTOR:
+                case MACH_MSG_OOL_PORTS_DESCRIPTOR:
+                    if(!is_task_64bit)
+                        send_size -= DESC_SIZE_ADJUSTMENT;
+                    break;
+                case MACH_MSG_PORT_DESCRIPTOR:
+                    send_size -= DESC_SIZE_ADJUSTMENT;
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+    return send_size;
 }
 
 /*
@@ -2812,8 +4413,6 @@ ipc_kmsg_copyout_size(
  *             Nothing locked.
  *     Returns:
  *             MACH_MSG_SUCCESS        Copied out all rights and memory.
- *             MACH_RCV_INVALID_NOTIFY Bad notify port.
- *                     Rights and memory in the message are intact.
  *             MACH_RCV_HEADER_ERROR + special bits
  *                     Rights and memory in the message are intact.
  *             MACH_RCV_BODY_ERROR + special bits
@@ -2826,14 +4425,15 @@ ipc_kmsg_copyout(
        ipc_kmsg_t              kmsg,
        ipc_space_t             space,
        vm_map_t                map,
-       mach_port_name_t        notify,
-       mach_msg_body_t         *slist)
+       mach_msg_body_t         *slist,
+        mach_msg_option_t      option)
 {
        mach_msg_return_t mr;
 
-       mr = ipc_kmsg_copyout_header(kmsg->ikm_header, space, notify);
-       if (mr != MACH_MSG_SUCCESS)
+       mr = ipc_kmsg_copyout_header(kmsg, space, option);
+       if (mr != MACH_MSG_SUCCESS) {
                return mr;
+       }
 
        if (kmsg->ikm_header->msgh_bits & MACH_MSGH_BITS_COMPLEX) {
                mr = ipc_kmsg_copyout_body(kmsg, space, map, slist);
@@ -2875,20 +4475,46 @@ ipc_kmsg_copyout_pseudo(
        mach_msg_bits_t mbits = kmsg->ikm_header->msgh_bits;
        ipc_object_t dest = (ipc_object_t) kmsg->ikm_header->msgh_remote_port;
        ipc_object_t reply = (ipc_object_t) kmsg->ikm_header->msgh_local_port;
+       ipc_object_t voucher = (ipc_object_t) kmsg->ikm_voucher;
        mach_msg_type_name_t dest_type = MACH_MSGH_BITS_REMOTE(mbits);
        mach_msg_type_name_t reply_type = MACH_MSGH_BITS_LOCAL(mbits);
+       mach_msg_type_name_t voucher_type = MACH_MSGH_BITS_VOUCHER(mbits);
+       mach_port_name_t voucher_name = kmsg->ikm_header->msgh_voucher_port;
        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
+       /*
+        * If we did this here, it looks like we wouldn't need the undo logic
+        * at the end of ipc_kmsg_send() in the error cases.  Not sure which
+        * would be more elegant to keep.
+        */
+       ipc_importance_clean(kmsg);
+#else
+       /* just assert it is already clean */
+       ipc_importance_assert_clean(kmsg);
+#endif
+
        mr = (ipc_kmsg_copyout_object(space, dest, dest_type, &dest_name) |
              ipc_kmsg_copyout_object(space, reply, reply_type, &reply_name));
 
-       kmsg->ikm_header->msgh_bits = mbits &~ MACH_MSGH_BITS_CIRCULAR;
-       kmsg->ikm_header->msgh_remote_port = (ipc_port_t)dest_name;
-       kmsg->ikm_header->msgh_local_port = (ipc_port_t)reply_name;
+       kmsg->ikm_header->msgh_bits = mbits & MACH_MSGH_BITS_USER;
+       kmsg->ikm_header->msgh_remote_port = CAST_MACH_NAME_TO_PORT(dest_name);
+       kmsg->ikm_header->msgh_local_port = CAST_MACH_NAME_TO_PORT(reply_name);
+
+       if (IO_VALID(voucher)) {
+               assert(voucher_type == MACH_MSG_TYPE_MOVE_SEND);
 
+               kmsg->ikm_voucher = IP_NULL;
+               mr |= ipc_kmsg_copyout_object(space, voucher, voucher_type, &voucher_name);
+               kmsg->ikm_header->msgh_voucher_port = voucher_name;
+       }
+               
        if (mbits & MACH_MSGH_BITS_COMPLEX) {
                mr |= ipc_kmsg_copyout_body(kmsg, space, map, slist);
        }
@@ -2913,25 +4539,32 @@ ipc_kmsg_copyout_dest(
        mach_msg_bits_t mbits;
        ipc_object_t dest;
        ipc_object_t reply;
+       ipc_object_t voucher;
        mach_msg_type_name_t dest_type;
        mach_msg_type_name_t reply_type;
-       mach_port_name_t dest_name, reply_name;
+       mach_msg_type_name_t voucher_type;
+       mach_port_name_t dest_name, reply_name, voucher_name;
 
        mbits = kmsg->ikm_header->msgh_bits;
        dest = (ipc_object_t) kmsg->ikm_header->msgh_remote_port;
        reply = (ipc_object_t) kmsg->ikm_header->msgh_local_port;
+       voucher = (ipc_object_t) kmsg->ikm_voucher;
+       voucher_name = kmsg->ikm_header->msgh_voucher_port;
        dest_type = MACH_MSGH_BITS_REMOTE(mbits);
        reply_type = MACH_MSGH_BITS_LOCAL(mbits);
+       voucher_type = MACH_MSGH_BITS_VOUCHER(mbits);
 
        assert(IO_VALID(dest));
 
+       ipc_importance_assert_clean(kmsg);
+
        io_lock(dest);
        if (io_active(dest)) {
                ipc_object_copyout_dest(space, dest, dest_type, &dest_name);
                /* dest is unlocked */
        } else {
+               io_unlock(dest);
                io_release(dest);
-               io_check_unlock(dest);
                dest_name = MACH_PORT_DEAD;
        }
 
@@ -2939,12 +4572,21 @@ ipc_kmsg_copyout_dest(
                ipc_object_destroy(reply, reply_type);
                reply_name = MACH_PORT_NULL;
        } else
-               reply_name = (mach_port_name_t) reply;
+               reply_name = CAST_MACH_PORT_TO_NAME(reply);
 
-       kmsg->ikm_header->msgh_bits = (MACH_MSGH_BITS_OTHER(mbits) |
-                                     MACH_MSGH_BITS(reply_type, dest_type));
-       kmsg->ikm_header->msgh_local_port = (ipc_port_t)dest_name;
-       kmsg->ikm_header->msgh_remote_port = (ipc_port_t)reply_name;
+       if (IO_VALID(voucher)) {
+               assert(voucher_type == MACH_MSG_TYPE_MOVE_SEND);
+
+               kmsg->ikm_voucher = IP_NULL;
+               ipc_object_destroy((ipc_object_t)voucher, voucher_type);
+               voucher_name = MACH_PORT_NULL;
+       }
+
+       kmsg->ikm_header->msgh_bits = MACH_MSGH_BITS_SET(reply_type, dest_type,
+                                                        voucher_type, mbits);
+       kmsg->ikm_header->msgh_local_port = CAST_MACH_NAME_TO_PORT(dest_name);
+       kmsg->ikm_header->msgh_remote_port = CAST_MACH_NAME_TO_PORT(reply_name);
+       kmsg->ikm_header->msgh_voucher_port = voucher_name;
 
        if (mbits & MACH_MSGH_BITS_COMPLEX) {
                mach_msg_body_t *body;
@@ -2955,156 +4597,6 @@ ipc_kmsg_copyout_dest(
        }
 }
 
-/*
- *      Routine:        ipc_kmsg_copyin_scatter
- *      Purpose:
- *              allocate and copyin a scatter list
- *      Algorithm:
- *              The gather (kmsg) is valid since it has been copied in.
- *              Gather list descriptors are sequentially paired with scatter
- *              list descriptors, with port descriptors in either list ignored.
- *              Descriptors are consistent if the type fileds match and size
- *              of the scatter descriptor is less than or equal to the
- *              size of the gather descriptor.  A MACH_MSG_ALLOCATE copy
- *              strategy in a scatter descriptor matches any size in the
- *              corresponding gather descriptor assuming they are the same type.
- *              Either list may be larger than the other.  During the
- *              subsequent copy out, excess scatter descriptors are ignored
- *              and excess gather descriptors default to dynamic allocation.
- *
- *              In the case of a size error, the scatter list is released.
- *      Conditions:
- *              Nothing locked.
- *      Returns:
- *              the allocated message body containing the scatter list.
- */
-
-mach_msg_body_t *
-ipc_kmsg_get_scatter(
-       mach_vm_address_t       msg_addr,
-       mach_msg_size_t         slist_size,
-       ipc_kmsg_t              kmsg)
-{
-        mach_msg_body_t         *slist;
-        mach_msg_body_t         *body;
-        mach_msg_descriptor_t   *gstart, *gend;
-        mach_msg_descriptor_t   *sstart, *send;
-
-
-        if (slist_size < sizeof(mach_msg_base_t))
-                return MACH_MSG_BODY_NULL;
-
-        slist_size -= sizeof(mach_msg_header_t);
-        slist = (mach_msg_body_t *)kalloc(slist_size);
-        if (slist == MACH_MSG_BODY_NULL)
-                return slist;
-
-        if (copyin(msg_addr + sizeof(mach_msg_header_t), (char *)slist, slist_size)) {
-                kfree(slist, slist_size);
-                return MACH_MSG_BODY_NULL;
-        }
-
-        if ((slist->msgh_descriptor_count* sizeof(mach_msg_descriptor_t)
-             + sizeof(mach_msg_size_t)) > slist_size) {
-                kfree(slist, slist_size);
-                return MACH_MSG_BODY_NULL;
-        }
-
-        body = (mach_msg_body_t *) (kmsg->ikm_header + 1);
-        gstart = (mach_msg_descriptor_t *) (body + 1);
-        gend = gstart + body->msgh_descriptor_count;
-
-        sstart = (mach_msg_descriptor_t *) (slist + 1);
-        send = sstart + slist->msgh_descriptor_count;
-
-        while (gstart < gend) {
-            mach_msg_descriptor_type_t  g_type;
-
-            /*
-             * Skip port descriptors in gather list.
-             */
-            g_type = gstart->type.type;
-
-            if (g_type != MACH_MSG_PORT_DESCRIPTOR) {
-
-             /*
-              * A scatter list with a 0 descriptor count is treated as an
-              * automatic size mismatch.
-              */
-             if (slist->msgh_descriptor_count == 0) {
-                        kfree(slist, slist_size);
-                        return MACH_MSG_BODY_NULL;
-             }
-
-             /*
-              * Skip port descriptors in  scatter list.
-              */
-             while (sstart < send) {
-                    if (sstart->type.type != MACH_MSG_PORT_DESCRIPTOR)
-                        break;
-                    sstart++;
-             }
-
-             /*
-              * No more scatter descriptors, we're done
-              */
-             if (sstart >= send) {
-                    break;
-             }
-
-             /*
-              * Check type, copy and size fields
-              */
-                if (g_type == MACH_MSG_OOL_DESCRIPTOR ||
-                    g_type == MACH_MSG_OOL_VOLATILE_DESCRIPTOR) {
-                    if (sstart->type.type != MACH_MSG_OOL_DESCRIPTOR &&
-                        sstart->type.type != MACH_MSG_OOL_VOLATILE_DESCRIPTOR) {
-                        kfree(slist, slist_size);
-                        return MACH_MSG_BODY_NULL;
-                    }
-                    if (sstart->out_of_line.copy == MACH_MSG_OVERWRITE &&
-                        gstart->out_of_line.size > sstart->out_of_line.size) {
-                        kfree(slist, slist_size);
-                        return MACH_MSG_BODY_NULL;
-                    }
-                }
-                else {
-                 if (sstart->type.type != MACH_MSG_OOL_PORTS_DESCRIPTOR) {
-                        kfree(slist, slist_size);
-                        return MACH_MSG_BODY_NULL;
-                 }
-                    if (sstart->ool_ports.copy == MACH_MSG_OVERWRITE &&
-                        gstart->ool_ports.count > sstart->ool_ports.count) {
-                        kfree(slist, slist_size);
-                        return MACH_MSG_BODY_NULL;
-                    }
-                }
-                sstart++;
-            }
-            gstart++;
-        }
-        return slist;
-}
-
-
-/*
- *      Routine:        ipc_kmsg_free_scatter
- *      Purpose:
- *              Deallocate a scatter list.  Since we actually allocated
- *              a body without a header, and since the header was originally
- *              accounted for in slist_size, we have to ajust it down
- *              before freeing the scatter list.
- */
-void
-ipc_kmsg_free_scatter(
-        mach_msg_body_t *slist,
-        mach_msg_size_t slist_size)
-{
-        slist_size -= sizeof(mach_msg_header_t);
-        kfree(slist, slist_size);
-}
-
-
 /*
  *     Routine:        ipc_kmsg_copyout_to_kernel
  *     Purpose:
@@ -3141,288 +4633,221 @@ ipc_kmsg_copyout_to_kernel(
                ipc_object_copyout_dest(space, dest, dest_type, &dest_name);
                /* dest is unlocked */
        } else {
+               io_unlock(dest);
                io_release(dest);
-               io_check_unlock(dest);
                dest_name = MACH_PORT_DEAD;
        }
 
-       reply_name = (mach_port_name_t) reply;
+       reply_name = CAST_MACH_PORT_TO_NAME(reply);
 
        kmsg->ikm_header->msgh_bits =
                (MACH_MSGH_BITS_OTHER(kmsg->ikm_header->msgh_bits) |
                                        MACH_MSGH_BITS(reply_type, dest_type));
-       kmsg->ikm_header->msgh_local_port = (ipc_port_t)dest_name;
-       kmsg->ikm_header->msgh_remote_port = (ipc_port_t)reply_name;
+       kmsg->ikm_header->msgh_local_port =  CAST_MACH_NAME_TO_PORT(dest_name);
+       kmsg->ikm_header->msgh_remote_port = CAST_MACH_NAME_TO_PORT(reply_name);
 }
 
-#include <mach_kdb.h>
-#if    MACH_KDB
-
-#include <ddb/db_output.h>
-#include <ipc/ipc_print.h>
-/*
- * Forward declarations
- */
-void ipc_msg_print_untyped(
-       mach_msg_body_t         *body);
-
-const char * ipc_type_name(
-       int             type_name,
-       boolean_t       received);
+#if IKM_SUPPORT_LEGACY
+void
+ipc_kmsg_copyout_to_kernel_legacy(
+       ipc_kmsg_t      kmsg,
+       ipc_space_t     space)
+{
+       ipc_object_t dest;
+       ipc_object_t reply;
+       mach_msg_type_name_t dest_type;
+       mach_msg_type_name_t reply_type;
+       mach_port_name_t dest_name, reply_name;
 
-void ipc_print_type_name(
-       int     type_name);
+       dest = (ipc_object_t) kmsg->ikm_header->msgh_remote_port;
+       reply = (ipc_object_t) kmsg->ikm_header->msgh_local_port;
+       dest_type = MACH_MSGH_BITS_REMOTE(kmsg->ikm_header->msgh_bits);
+       reply_type = MACH_MSGH_BITS_LOCAL(kmsg->ikm_header->msgh_bits);
 
-const char *
-msgh_bit_decode(
-       mach_msg_bits_t bit);
+       assert(IO_VALID(dest));
 
-const char *
-mm_copy_options_string(
-       mach_msg_copy_options_t option);
+       io_lock(dest);
+       if (io_active(dest)) {
+               ipc_object_copyout_dest(space, dest, dest_type, &dest_name);
+               /* dest is unlocked */
+       } else {
+               io_unlock(dest);
+               io_release(dest);
+               dest_name = MACH_PORT_DEAD;
+       }
 
-void db_print_msg_uid(mach_msg_header_t *);
+       reply_name = CAST_MACH_PORT_TO_NAME(reply);
 
+       kmsg->ikm_header->msgh_bits =
+               (MACH_MSGH_BITS_OTHER(kmsg->ikm_header->msgh_bits) |
+                                       MACH_MSGH_BITS(reply_type, dest_type));
+       kmsg->ikm_header->msgh_local_port =  CAST_MACH_NAME_TO_PORT(dest_name);
+       kmsg->ikm_header->msgh_remote_port = CAST_MACH_NAME_TO_PORT(reply_name);
+
+    mach_msg_descriptor_t *saddr;
+    mach_msg_legacy_descriptor_t *daddr;
+    mach_msg_type_number_t i, count = ((mach_msg_base_t *)kmsg->ikm_header)->body.msgh_descriptor_count;
+    saddr = (mach_msg_descriptor_t *) (((mach_msg_base_t *)kmsg->ikm_header) + 1);
+    saddr = &saddr[count-1];
+    daddr = (mach_msg_legacy_descriptor_t *)&saddr[count];
+    daddr--;
+
+    vm_offset_t dsc_adjust = 0;
+
+    for (i = 0; i < count; i++, saddr--, daddr--) {
+    switch (saddr->type.type) {
+        case MACH_MSG_PORT_DESCRIPTOR: {
+        mach_msg_port_descriptor_t *dsc = &saddr->port;
+        mach_msg_legacy_port_descriptor_t *dest_dsc = &daddr->port;
+
+        mach_port_t name = dsc->name;
+        mach_msg_type_name_t disposition = dsc->disposition;
+
+        dest_dsc->name = CAST_MACH_PORT_TO_NAME(name);
+        dest_dsc->disposition = disposition;
+        dest_dsc->type = MACH_MSG_PORT_DESCRIPTOR;
+        break;
+        }
+    case MACH_MSG_OOL_VOLATILE_DESCRIPTOR:
+    case MACH_MSG_OOL_DESCRIPTOR: {
+        /* The sender should supply ready-made memory, i.e. a vm_map_copy_t
+         * so we don't need to do anything special. */
+
+        mach_msg_ool_descriptor_t      *source_dsc = (typeof(source_dsc))&saddr->out_of_line;
+
+            mach_msg_ool_descriptor32_t        *dest_dsc = &daddr->out_of_line32;
+
+        vm_offset_t                        address = (vm_offset_t)source_dsc->address;
+        vm_size_t                      size = source_dsc->size;
+        boolean_t                      deallocate = source_dsc->deallocate;
+        mach_msg_copy_options_t                copy = source_dsc->copy;
+        mach_msg_descriptor_type_t  type = source_dsc->type;
+
+        dest_dsc->address = address;
+        dest_dsc->size = size;
+        dest_dsc->deallocate = deallocate;
+        dest_dsc->copy = copy;
+        dest_dsc->type = type;
+        break;
+        }
+    case MACH_MSG_OOL_PORTS_DESCRIPTOR: {
+        mach_msg_ool_ports_descriptor_t        *source_dsc = (typeof(source_dsc))&saddr->ool_ports;
+
+            mach_msg_ool_ports_descriptor32_t  *dest_dsc = &daddr->ool_ports32;
+
+        vm_offset_t                        address = (vm_offset_t)source_dsc->address;
+        vm_size_t                      port_count = source_dsc->count;
+        boolean_t                      deallocate = source_dsc->deallocate;
+        mach_msg_copy_options_t                copy = source_dsc->copy;
+        mach_msg_descriptor_type_t  type = source_dsc->type;
+
+        dest_dsc->address = address;
+        dest_dsc->count = port_count;
+        dest_dsc->deallocate = deallocate;
+        dest_dsc->copy = copy;
+        dest_dsc->type = type;
+        break;
+        }
+        default: {
+#if    MACH_ASSERT
+        panic("ipc_kmsg_copyin_from_kernel:  bad descriptor");
+#endif /* MACH_ASSERT */
+                 }
+    }
+    }
 
-const char *
-ipc_type_name(
-       int             type_name,
-       boolean_t       received)
-{
-       switch (type_name) {
-               case MACH_MSG_TYPE_PORT_NAME:
-               return "port_name";
-               
-               case MACH_MSG_TYPE_MOVE_RECEIVE:
-               if (received) {
-                       return "port_receive";
-               } else {
-                       return "move_receive";
-               }
-               
-               case MACH_MSG_TYPE_MOVE_SEND:
-               if (received) {
-                       return "port_send";
-               } else {
-                       return "move_send";
-               }
-               
-               case MACH_MSG_TYPE_MOVE_SEND_ONCE:
-               if (received) {
-                       return "port_send_once";
-               } else {
-                       return "move_send_once";
-               }
-               
-               case MACH_MSG_TYPE_COPY_SEND:
-               return "copy_send";
-               
-               case MACH_MSG_TYPE_MAKE_SEND:
-               return "make_send";
-               
-               case MACH_MSG_TYPE_MAKE_SEND_ONCE:
-               return "make_send_once";
-               
-               default:
-               return (char *) 0;
-       }
-}
-               
-void
-ipc_print_type_name(
-       int     type_name)
-{
-       const char *name = ipc_type_name(type_name, TRUE);
-       if (name) {
-               printf("%s", name);
-       } else {
-               printf("type%d", type_name);
-       }
+    if(count) {
+        dsc_adjust = 4*count;
+        memmove((char *)((vm_offset_t)kmsg->ikm_header + dsc_adjust), kmsg->ikm_header, sizeof(mach_msg_base_t));
+        kmsg->ikm_header = (mach_msg_header_t *)((vm_offset_t)kmsg->ikm_header + dsc_adjust);
+        /* Update the message size for the smaller user representation */
+        kmsg->ikm_header->msgh_size -= dsc_adjust;
+    }
 }
+#endif /* IKM_SUPPORT_LEGACY */
 
+#ifdef __arm64__
 /*
- * ipc_kmsg_print      [ debug ]
+ * Just sets those parts of the trailer that aren't set up at allocation time.
  */
-void
-ipc_kmsg_print(
-       ipc_kmsg_t      kmsg)
+static void
+ipc_kmsg_munge_trailer(mach_msg_max_trailer_t *in, void *_out, boolean_t is64bit) 
 {
-       iprintf("kmsg=0x%x\n", kmsg);
-       iprintf("ikm_next=0x%x, prev=0x%x, size=%d",
-               kmsg->ikm_next,
-               kmsg->ikm_prev,
-               kmsg->ikm_size);
-       printf("\n");
-       ipc_msg_print(kmsg->ikm_header);
-}
-
-const char *
-msgh_bit_decode(
-       mach_msg_bits_t bit)
-{
-       switch (bit) {
-           case MACH_MSGH_BITS_COMPLEX:        return "complex";
-           case MACH_MSGH_BITS_CIRCULAR:       return "circular";
-           default:                            return (char *) 0;
+       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__ */
 
-/*
- * ipc_msg_print       [ debug ]
- */
-void
-ipc_msg_print(
-       mach_msg_header_t       *msgh)
+mach_msg_trailer_size_t
+ipc_kmsg_add_trailer(ipc_kmsg_t kmsg, ipc_space_t space __unused, 
+               mach_msg_option_t option, thread_t thread, 
+               mach_port_seqno_t seqno, boolean_t minimal_trailer,
+               mach_vm_offset_t context)
 {
-       mach_msg_bits_t mbits;
-       unsigned int    bit, i;
-       const char      *bit_name;
-       int             needs_comma;
+       mach_msg_max_trailer_t *trailer;
 
-       mbits = msgh->msgh_bits;
-       iprintf("msgh_bits=0x%x:  l=0x%x,r=0x%x\n",
-               mbits,
-               MACH_MSGH_BITS_LOCAL(msgh->msgh_bits),
-               MACH_MSGH_BITS_REMOTE(msgh->msgh_bits));
+#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));
 
-       mbits = MACH_MSGH_BITS_OTHER(mbits) & MACH_MSGH_BITS_USED;
-       db_indent += 2;
-       if (mbits)
-               iprintf("decoded bits:  ");
-       needs_comma = 0;
-       for (i = 0, bit = 1; i < sizeof(mbits) * 8; ++i, bit <<= 1) {
-               if ((mbits & bit) == 0)
-                       continue;
-               bit_name = msgh_bit_decode((mach_msg_bits_t)bit);
-               if (bit_name)
-                       printf("%s%s", needs_comma ? "," : "", bit_name);
-               else
-                       printf("%sunknown(0x%x),", needs_comma ? "," : "", bit);
-               ++needs_comma;
-       }
-       if (msgh->msgh_bits & ~MACH_MSGH_BITS_USED) {
-               printf("%sunused=0x%x,", needs_comma ? "," : "",
-                      msgh->msgh_bits & ~MACH_MSGH_BITS_USED);
+       /* 
+        * 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;
        }
-       printf("\n");
-       db_indent -= 2;
 
-       needs_comma = 1;
-       if (msgh->msgh_remote_port) {
-               iprintf("remote=0x%x(", msgh->msgh_remote_port);
-               ipc_print_type_name(MACH_MSGH_BITS_REMOTE(msgh->msgh_bits));
-               printf(")");
-       } else {
-               iprintf("remote=null");
-       }
+       trailer->msgh_seqno = seqno;
+       trailer->msgh_context = context;
+       trailer->msgh_trailer_size = REQUESTED_TRAILER_SIZE(thread_is_64bit(thread), option);
 
-       if (msgh->msgh_local_port) {
-               printf("%slocal=0x%x(", needs_comma ? "," : "",
-                      msgh->msgh_local_port);
-               ipc_print_type_name(MACH_MSGH_BITS_LOCAL(msgh->msgh_bits));
-               printf(")\n");
-       } else {
-               printf("local=null\n");
+       if (minimal_trailer) { 
+               goto done;
        }
 
-       iprintf("msgh_id=%d, size=%d\n",
-               msgh->msgh_id,
-               msgh->msgh_size);
-
-       if (mbits & MACH_MSGH_BITS_COMPLEX) {   
-               ipc_msg_print_untyped((mach_msg_body_t *) (msgh + 1));
+       if (MACH_RCV_TRAILER_ELEMENTS(option) >= 
+                       MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_AV)){
+               trailer->msgh_ad = 0;
        }
-}
-
 
-const char *
-mm_copy_options_string(
-       mach_msg_copy_options_t option)
-{
-       const char      *name;
+       /*
+        * The ipc_kmsg_t holds a reference to the label of a label
+        * handle, not the port. We must get a reference to the port
+        * and a send right to copyout to the receiver.
+        */
 
-       switch (option) {
-           case MACH_MSG_PHYSICAL_COPY:
-               name = "PHYSICAL";
-               break;
-           case MACH_MSG_VIRTUAL_COPY:
-               name = "VIRTUAL";
-               break;
-           case MACH_MSG_OVERWRITE:
-               name = "OVERWRITE";
-               break;
-           case MACH_MSG_ALLOCATE:
-               name = "ALLOCATE";
-               break;
-           case MACH_MSG_KALLOC_COPY_T:
-               name = "KALLOC_COPY_T";
-               break;
-           default:
-               name = "unknown";
-               break;
+       if (option & MACH_RCV_TRAILER_ELEMENTS (MACH_RCV_TRAILER_LABELS)) {
+               trailer->msgh_labels.sender = 0;
        }
-       return name;
-}
-
-void
-ipc_msg_print_untyped(
-       mach_msg_body_t         *body)
-{
-    mach_msg_descriptor_t      *saddr, *send;
-    mach_msg_descriptor_type_t type;
-
-    iprintf("%d descriptors %d: \n", body->msgh_descriptor_count);
-
-    saddr = (mach_msg_descriptor_t *) (body + 1);
-    send = saddr + body->msgh_descriptor_count;
-
-    for ( ; saddr < send; saddr++ ) {
-       
-       type = saddr->type.type;
-
-       switch (type) {
-           
-           case MACH_MSG_PORT_DESCRIPTOR: {
-               mach_msg_port_descriptor_t *dsc;
 
-               dsc = &saddr->port;
-               iprintf("-- PORT name = 0x%x disp = ", dsc->name);
-               ipc_print_type_name(dsc->disposition);
-               printf("\n");
-               break;
-           }
-           case MACH_MSG_OOL_VOLATILE_DESCRIPTOR:
-           case MACH_MSG_OOL_DESCRIPTOR: {
-               mach_msg_ool_descriptor_t *dsc;
-               
-               dsc = &saddr->out_of_line;
-               iprintf("-- OOL%s addr = 0x%x size = 0x%x copy = %s %s\n",
-                       type == MACH_MSG_OOL_DESCRIPTOR ? "" : " VOLATILE",
-                       dsc->address, dsc->size,
-                       mm_copy_options_string(dsc->copy),
-                       dsc->deallocate ? "DEALLOC" : "");
-               break;
-           } 
-           case MACH_MSG_OOL_PORTS_DESCRIPTOR : {
-               mach_msg_ool_ports_descriptor_t *dsc;
+done:
+#ifdef __arm64__
+       ipc_kmsg_munge_trailer(trailer, real_trailer_out, thread_is_64bit(thread));
+#endif /* __arm64__ */
 
-               dsc = &saddr->ool_ports;
-
-               iprintf("-- OOL_PORTS addr = 0x%x count = 0x%x ",
-                         dsc->address, dsc->count);
-               printf("disp = ");
-               ipc_print_type_name(dsc->disposition);
-               printf(" copy = %s %s\n",
-                      mm_copy_options_string(dsc->copy),
-                      dsc->deallocate ? "DEALLOC" : "");
-               break;
-           }
-
-           default: {
-               iprintf("-- UNKNOWN DESCRIPTOR 0x%x\n", type);
-               break;
-           }
-       }
-    }
+       return trailer->msgh_trailer_size;
 }
-#endif /* MACH_KDB */