xnu-3248.30.4.tar.gz

[apple/xnu.git] / osfmk / kern / ipc_kobject.c

diff --git a/osfmk/kern/ipc_kobject.c b/osfmk/kern/ipc_kobject.c
index 5eaef10b7c87ab3b3380e049ae26e7b4b45c31c5..7aa0466dbc615016bcde299a4d5386260450672f 100644 (file)
--- a/osfmk/kern/ipc_kobject.c
+++ b/osfmk/kern/ipc_kobject.c
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2010 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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. 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.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * 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@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -47,6 +53,13 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
  * 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.
+ */

 /*
  */
 /*
 /*
  */
 /*


@@ -59,39 +72,74 @@
 
 #include <mach_debug.h>
 #include <mach_ipc_test.h>
 
 #include <mach_debug.h>
 #include <mach_ipc_test.h>

-#include <mach_machine_routines.h>
-#include <norma_task.h>

 #include <mach_rt.h>
 #include <mach_rt.h>

-#include <platforms.h>

 
 

-#include <kern/ast.h>
+#include <mach/mig.h>

 #include <mach/port.h>
 #include <mach/kern_return.h>
 #include <mach/message.h>
 #include <mach/mig_errors.h>
 #include <mach/notify.h>
 #include <mach/port.h>
 #include <mach/kern_return.h>
 #include <mach/message.h>
 #include <mach/mig_errors.h>
 #include <mach/notify.h>

-#include <kern/etap_macros.h>
+#include <mach/ndr.h>
+#include <mach/vm_param.h>
+
+#include <mach/mach_vm_server.h>
+#include <mach/mach_port_server.h>
+#include <mach/mach_host_server.h>
+#include <mach/host_priv_server.h>
+#include <mach/host_security_server.h>
+#include <mach/clock_server.h>
+#include <mach/clock_priv_server.h>
+#include <mach/lock_set_server.h>
+#include <default_pager/default_pager_object_server.h>
+#include <mach/memory_object_server.h>
+#include <mach/memory_object_control_server.h>
+#include <mach/memory_object_default_server.h>
+#include <mach/processor_server.h>
+#include <mach/processor_set_server.h>
+#include <mach/task_server.h>
+#include <mach/mach_voucher_server.h>
+#include <mach/mach_voucher_attr_control_server.h>
+#if VM32_SUPPORT
+#include <mach/vm32_map_server.h>
+#endif
+#include <mach/thread_act_server.h>
+
+#include <device/device_types.h>
+#include <device/device_server.h>
+
+#include <UserNotification/UNDReplyServer.h>
+
+#if    CONFIG_AUDIT
+#include <kern/audit_sessionport.h>
+#endif
+
+#if     MACH_MACHINE_ROUTINES
+#include <machine/machine_routines.h>
+#endif /* MACH_MACHINE_ROUTINES */
+#if    XK_PROXY
+#include <uk_xkern/xk_uproxy_server.h>
+#endif /* XK_PROXY */
+
+#include <kern/ipc_tt.h>

 #include <kern/ipc_mig.h>
 #include <kern/ipc_mig.h>

+#include <kern/ipc_misc.h>

 #include <kern/ipc_kobject.h>
 #include <kern/ipc_kobject.h>

-#include <kern/misc_protos.h>
+#include <kern/host_notify.h>

 #include <kern/mk_timer.h>
 #include <kern/mk_timer.h>

-#include <ipc/ipc_object.h>
+#include <kern/misc_protos.h>

 #include <ipc/ipc_kmsg.h>
 #include <ipc/ipc_port.h>
 #include <ipc/ipc_kmsg.h>
 #include <ipc/ipc_port.h>

+#include <ipc/ipc_voucher.h>
+#include <kern/sync_sema.h>

 #include <kern/counters.h>
 
 #include <kern/counters.h>
 

+#include <vm/vm_protos.h>

 
 

-void
-                def_pager_hash_insert(
-                               ipc_port_t name_port);
-void             pager_mux_hash_insert(
-                                ipc_port_t              port,
-                                rpc_subsystem_t         rec);
-void             pager_mux_hash_delete(
-                                ipc_port_t              port);
-rpc_subsystem_t  pager_mux_hash_lookup(
-                                ipc_port_t              port);
+#include <security/mac_mach_internal.h>

 
 

+extern char *proc_name_address(void *p);
+extern int proc_pid(void *p);

 
 /*
  *     Routine:        ipc_kobject_notify
 
 /*
  *     Routine:        ipc_kobject_notify


@@ -103,8 +151,6 @@ ipc_kobject_notify(
         mach_msg_header_t *request_header,
         mach_msg_header_t *reply_header);
 
         mach_msg_header_t *request_header,
         mach_msg_header_t *reply_header);
 

-#include <mach/ndr.h>
-

 typedef struct {
         mach_msg_id_t num;
         mig_routine_t routine;
 typedef struct {
         mach_msg_id_t num;
         mig_routine_t routine;


@@ -114,93 +160,63 @@ typedef struct {
 #endif
 } mig_hash_t;
 
 #endif
 } mig_hash_t;
 

-#define MAX_MIG_ENTRIES 1024
+#define MAX_MIG_ENTRIES 1031

 #define MIG_HASH(x) (x)
 
 #ifndef max
 #define max(a,b)        (((a) > (b)) ? (a) : (b))
 #endif /* max */
 
 #define MIG_HASH(x) (x)
 
 #ifndef max
 #define max(a,b)        (((a) > (b)) ? (a) : (b))
 #endif /* max */
 

-mig_hash_t mig_buckets[MAX_MIG_ENTRIES];
-int mig_table_max_displ;
-mach_msg_size_t mig_reply_size;
-
-
-#include <mach/mach_port_server.h>
-#include <mach/mach_host_server.h>
-#include <mach/host_priv_server.h>
-#include <mach/host_security_server.h>
-#include <mach/clock_server.h>
-#include <mach/clock_priv_server.h>
-#include <mach/ledger_server.h>
-#include <mach/lock_set_server.h>
-#include <default_pager/default_pager_object_server.h>
-#include <mach/memory_object_server.h>
-#include <mach/memory_object_control_server.h>
-#include <mach/memory_object_default_server.h>
-#include <mach/memory_object_name_server.h>
-#include <mach/processor_server.h>
-#include <mach/processor_set_server.h>
-#include <mach/semaphore_server.h>
-#include <mach/task_server.h>
-#include <mach/vm_map_server.h>
-#include <mach/thread_act_server.h>
-#include <device/device_server.h>
-#include <UserNotification/UNDReplyServer.h>
-
-#if     MACH_MACHINE_ROUTINES
-#include <machine/machine_routines.h>
-#endif /* MACH_MACHINE_ROUTINES */
-#if    XK_PROXY
-#include <uk_xkern/xk_uproxy_server.h>
-#endif /* XK_PROXY */
-
-
-rpc_subsystem_t mig_e[] = {
-        (rpc_subsystem_t)&mach_port_subsystem,
-        (rpc_subsystem_t)&mach_host_subsystem,
-        (rpc_subsystem_t)&host_priv_subsystem,
-        (rpc_subsystem_t)&host_security_subsystem,
-        (rpc_subsystem_t)&clock_subsystem,
-        (rpc_subsystem_t)&clock_priv_subsystem,
-        (rpc_subsystem_t)&processor_subsystem,
-        (rpc_subsystem_t)&processor_set_subsystem,
-        (rpc_subsystem_t)&is_iokit_subsystem,
-        (rpc_subsystem_t)&dp_memory_object_subsystem,
-        (rpc_subsystem_t)&dp_memory_object_default_subsystem,
-        (rpc_subsystem_t)&memory_object_name_subsystem,
-       (rpc_subsystem_t)&default_pager_object_subsystem,
-       (rpc_subsystem_t)&lock_set_subsystem,
-       (rpc_subsystem_t)&ledger_subsystem,
-       (rpc_subsystem_t)&semaphore_subsystem,
-       (rpc_subsystem_t)&task_subsystem,
-       (rpc_subsystem_t)&thread_act_subsystem,
-       (rpc_subsystem_t)&vm_map_subsystem,
-       (rpc_subsystem_t)&UNDReply_subsystem,
+static mig_hash_t mig_buckets[MAX_MIG_ENTRIES];
+static int mig_table_max_displ;
+static mach_msg_size_t mig_reply_size = sizeof(mig_reply_error_t);
+
+
+
+const struct mig_subsystem *mig_e[] = {
+        (const struct mig_subsystem *)&mach_vm_subsystem,
+        (const struct mig_subsystem *)&mach_port_subsystem,
+        (const struct mig_subsystem *)&mach_host_subsystem,
+        (const struct mig_subsystem *)&host_priv_subsystem,
+        (const struct mig_subsystem *)&host_security_subsystem,
+        (const struct mig_subsystem *)&clock_subsystem,
+        (const struct mig_subsystem *)&clock_priv_subsystem,
+        (const struct mig_subsystem *)&processor_subsystem,
+        (const struct mig_subsystem *)&processor_set_subsystem,
+        (const struct mig_subsystem *)&is_iokit_subsystem,
+       (const struct mig_subsystem *)&lock_set_subsystem,
+       (const struct mig_subsystem *)&task_subsystem,
+       (const struct mig_subsystem *)&thread_act_subsystem,
+#if VM32_SUPPORT
+       (const struct mig_subsystem *)&vm32_map_subsystem,
+#endif
+       (const struct mig_subsystem *)&UNDReply_subsystem,
+       (const struct mig_subsystem *)&default_pager_object_subsystem,
+       (const struct mig_subsystem *)&mach_voucher_subsystem,
+       (const struct mig_subsystem *)&mach_voucher_attr_control_subsystem,

 
 #if     XK_PROXY
 
 #if     XK_PROXY

-        (rpc_subsystem_t)&do_uproxy_xk_uproxy_subsystem,
+        (const struct mig_subsystem *)&do_uproxy_xk_uproxy_subsystem,

 #endif /* XK_PROXY */
 #if     MACH_MACHINE_ROUTINES
 #endif /* XK_PROXY */
 #if     MACH_MACHINE_ROUTINES

-        (rpc_subsystem_t)&MACHINE_SUBSYSTEM,
+        (const struct mig_subsystem *)&MACHINE_SUBSYSTEM,

 #endif  /* MACH_MACHINE_ROUTINES */
 #if     MCMSG && iPSC860
 #endif  /* MACH_MACHINE_ROUTINES */
 #if     MCMSG && iPSC860

-       (rpc_subsystem_t)&mcmsg_info_subsystem,
+       (const struct mig_subsystem *)&mcmsg_info_subsystem,

 #endif  /* MCMSG && iPSC860 */
 };
 
 void
 mig_init(void)
 {
 #endif  /* MCMSG && iPSC860 */
 };
 
 void
 mig_init(void)
 {

-    register unsigned int i, n = sizeof(mig_e)/sizeof(rpc_subsystem_t);
-    register unsigned int howmany;
-    register mach_msg_id_t j, pos, nentry, range;
+    unsigned int i, n = sizeof(mig_e)/sizeof(const struct mig_subsystem *);
+    int howmany;
+    mach_msg_id_t j, pos, nentry, range;

        
     for (i = 0; i < n; i++) {
        range = mig_e[i]->end - mig_e[i]->start;
        if (!mig_e[i]->start || range < 0)
            panic("the msgh_ids in mig_e[] aren't valid!");
        
     for (i = 0; i < n; i++) {
        range = mig_e[i]->end - mig_e[i]->start;
        if (!mig_e[i]->start || range < 0)
            panic("the msgh_ids in mig_e[] aren't valid!");

-       mig_reply_size = max(mig_reply_size, mig_e[i]->maxsize);

 
        for  (j = 0; j < range; j++) {
          if (mig_e[i]->routine[j].stub_routine) { 
 
        for  (j = 0; j < range; j++) {
          if (mig_e[i]->routine[j].stub_routine) { 


@@ -208,7 +224,7 @@ mig_init(void)
            nentry = j + mig_e[i]->start;       
            for (pos = MIG_HASH(nentry) % MAX_MIG_ENTRIES, howmany = 1;
                 mig_buckets[pos].num;
            nentry = j + mig_e[i]->start;       
            for (pos = MIG_HASH(nentry) % MAX_MIG_ENTRIES, howmany = 1;
                 mig_buckets[pos].num;

-                pos = ++pos % MAX_MIG_ENTRIES, howmany++) {
+                pos++, pos = pos % MAX_MIG_ENTRIES, howmany++) {

                 if (mig_buckets[pos].num == nentry) {
                        printf("message id = %d\n", nentry);
                        panic("multiple entries with the same msgh_id");
                 if (mig_buckets[pos].num == nentry) {
                        printf("message id = %d\n", nentry);
                        panic("multiple entries with the same msgh_id");


@@ -228,112 +244,7 @@ mig_init(void)
          }
        }
     }
          }
        }
     }

-}
-
-
-#define PAGER_MUX_HASH_COUNT 127
-
-
-struct pager_mux_entry {
-       queue_chain_t   links;
-       ipc_port_t      name;
-       rpc_subsystem_t pager_object;
-};
-typedef struct pager_mux_entry *pager_mux_entry_t;
-
-queue_head_t   pager_mux_hashtable[PAGER_MUX_HASH_COUNT];
-zone_t         pager_mux_hash_zone;
-
-decl_mutex_data(,pager_mux_hash_lock)
-
-#define        pager_mux_hash(name_port) \
-               (((natural_t)(name_port) & 0xffffff) % PAGER_MUX_HASH_COUNT)
-
-
-rpc_subsystem_t
-pager_mux_hash_lookup(
-       ipc_port_t      name_port)
-{
-       register queue_t        bucket;
-       register pager_mux_entry_t      entry;
-       register rpc_subsystem_t        pager_object;
-
-       bucket = &pager_mux_hashtable[pager_mux_hash(name_port)];
-
-       mutex_lock(&pager_mux_hash_lock);
-       for (entry = (pager_mux_entry_t)queue_first(bucket);
-            !queue_end(bucket, &entry->links);
-            entry = (pager_mux_entry_t)queue_next(&entry->links)) {
-           if (entry->name == name_port) {
-               pager_object = entry->pager_object;
-               /* don't need to reference the object, it can't disappear */
-               /* pager_mux_reference(pager_object); */
-               mutex_unlock(&pager_mux_hash_lock);
-               return (pager_object);
-           }
-       }
-       mutex_unlock(&pager_mux_hash_lock);
-       return (rpc_subsystem_t)0;
-}
-
-
-void
-pager_mux_hash_init(void)
-{
-       register int    i;
-       register vm_size_t      size;
-
-       size = sizeof(struct pager_mux_entry);
-       pager_mux_hash_zone = zinit(
-                               size,
-                               size * 2000,
-                               PAGE_SIZE,
-                               "pager mux port hash");
-       for (i = 0; i < PAGER_MUX_HASH_COUNT; i++)
-           queue_init(&pager_mux_hashtable[i]);
-       mutex_init(&pager_mux_hash_lock, ETAP_IO_DEV_PAGEH);
-}
-
-
-void
-pager_mux_hash_insert(
-       ipc_port_t      name_port,
-       rpc_subsystem_t pager_object)
-{
-       register pager_mux_entry_t new_entry;
-
-       new_entry = (pager_mux_entry_t) zalloc(pager_mux_hash_zone);
-       new_entry->links.prev = (queue_entry_t) 0;
-       new_entry->links.next = (queue_entry_t) 0;
-       new_entry->name = name_port;
-       new_entry->pager_object = pager_object;
-
-       mutex_lock(&pager_mux_hash_lock);
-       queue_enter((&pager_mux_hashtable[pager_mux_hash(name_port)]),
-                       new_entry, pager_mux_entry_t, links);
-       mutex_unlock(&pager_mux_hash_lock);
-}
-
-void
-pager_mux_hash_delete(
-       ipc_port_t      name_port)
-{
-       register queue_t        bucket;
-       register pager_mux_entry_t      entry;
-
-       bucket = &pager_mux_hashtable[pager_mux_hash(name_port)];
-
-       mutex_lock(&pager_mux_hash_lock);
-       for (entry = (pager_mux_entry_t)queue_first(bucket);
-            !queue_end(bucket, &entry->links);
-            entry = (pager_mux_entry_t)queue_next(&entry->links)) {
-           if (entry->name == name_port) {
-               queue_remove(bucket, entry, pager_mux_entry_t, links);
-               zfree(pager_mux_hash_zone, (vm_offset_t)entry);
-               break;
-           }
-       }
-       mutex_unlock(&pager_mux_hash_lock);
+    printf("mig_table_max_displ = %d\n", mig_table_max_displ);

 }
 
 
 }
 
 


@@ -354,24 +265,16 @@ ipc_kobject_server(
        mach_msg_size_t reply_size;
        ipc_kmsg_t reply;
        kern_return_t kr;
        mach_msg_size_t reply_size;
        ipc_kmsg_t reply;
        kern_return_t kr;

-       mig_routine_t routine;

        ipc_port_t *destp;
        ipc_port_t *destp;

+       ipc_port_t  replyp = IPC_PORT_NULL;

        mach_msg_format_0_trailer_t *trailer;
        register mig_hash_t *ptr;
        mach_msg_format_0_trailer_t *trailer;
        register mig_hash_t *ptr;

-       unsigned int th;
-
-       /* Only fetch current thread if ETAP is configured */
-       ETAP_DATA_LOAD(th, current_thread());
-        ETAP_PROBE_DATA(ETAP_P_SYSCALL_MACH,
-                        EVENT_BEGIN,
-                       ((thread_t) th),
-                        &request->ikm_header.msgh_id,
-                        sizeof(int));
+

        /*
        /*

-         * Find out corresponding mig_hash entry if any
-         */
+        * Find out corresponding mig_hash entry if any
+        */

        {
        {

-           register int key = request->ikm_header.msgh_id;
+           register int key = request->ikm_header->msgh_id;

            register int i = MIG_HASH(key);
            register int max_iter = mig_table_max_displ;
        
            register int i = MIG_HASH(key);
            register int max_iter = mig_table_max_displ;
        


@@ -404,16 +307,24 @@ ipc_kobject_server(
         * Initialize reply message.
         */
        {
         * Initialize reply message.
         */
        {

-#define        InP     ((mach_msg_header_t *) &request->ikm_header)
-#define        OutP    ((mig_reply_error_t *) &reply->ikm_header)
+#define        InP     ((mach_msg_header_t *) request->ikm_header)
+#define        OutP    ((mig_reply_error_t *) reply->ikm_header)
+
+           /* 
+            * MIG should really assure no data leakage -
+            * but until it does, pessimistically zero the
+            * whole reply buffer.
+            */
+           bzero((void *)OutP, reply_size);

 
            OutP->NDR = NDR_record;
            OutP->Head.msgh_size = sizeof(mig_reply_error_t);
 
            OutP->Head.msgh_bits =
 
            OutP->NDR = NDR_record;
            OutP->Head.msgh_size = sizeof(mig_reply_error_t);
 
            OutP->Head.msgh_bits =

-               MACH_MSGH_BITS(MACH_MSGH_BITS_LOCAL(InP->msgh_bits), 0);
+               MACH_MSGH_BITS_SET(MACH_MSGH_BITS_LOCAL(InP->msgh_bits), 0, 0, 0);

            OutP->Head.msgh_remote_port = InP->msgh_local_port;
            OutP->Head.msgh_remote_port = InP->msgh_local_port;

-           OutP->Head.msgh_local_port  = MACH_PORT_NULL;
+           OutP->Head.msgh_local_port = MACH_PORT_NULL;
+           OutP->Head.msgh_voucher_port = MACH_PORT_NULL;

            OutP->Head.msgh_id = InP->msgh_id + 100;
 
 #undef InP
            OutP->Head.msgh_id = InP->msgh_id + 100;
 
 #undef InP


@@ -426,18 +337,18 @@ ipc_kobject_server(
         */
        {
            if (ptr) {  
         */
        {
            if (ptr) {  

-               (*ptr->routine)(&request->ikm_header, &reply->ikm_header);
+               (*ptr->routine)(request->ikm_header, reply->ikm_header);

                kernel_task->messages_received++;
            }
            else {
                kernel_task->messages_received++;
            }
            else {

-               if (!ipc_kobject_notify(&request->ikm_header, &reply->ikm_header)){
-#if    MACH_IPC_TEST
+               if (!ipc_kobject_notify(request->ikm_header, reply->ikm_header)){
+#if DEVELOPMENT || DEBUG

                    printf("ipc_kobject_server: bogus kernel message, id=%d\n",
                    printf("ipc_kobject_server: bogus kernel message, id=%d\n",

-                       request->ikm_header.msgh_id);
-#endif /* MACH_IPC_TEST */
-                   _MIG_MSGID_INVALID(request->ikm_header.msgh_id);
+                       request->ikm_header->msgh_id);
+#endif /* DEVELOPMENT || DEBUG */
+                   _MIG_MSGID_INVALID(request->ikm_header->msgh_id);

 
 

-                   ((mig_reply_error_t *) &reply->ikm_header)->RetCode
+                   ((mig_reply_error_t *) reply->ikm_header)->RetCode

                        = MIG_BAD_ID;
                }
                else
                        = MIG_BAD_ID;
                }
                else


@@ -457,8 +368,8 @@ ipc_kobject_server(
         *      We set msgh_remote_port to IP_NULL so that the kmsg
         *      destroy routines don't try to destroy the port twice.
         */
         *      We set msgh_remote_port to IP_NULL so that the kmsg
         *      destroy routines don't try to destroy the port twice.
         */

-       destp = (ipc_port_t *) &request->ikm_header.msgh_remote_port;
-       switch (MACH_MSGH_BITS_REMOTE(request->ikm_header.msgh_bits)) {
+       destp = (ipc_port_t *) &request->ikm_header->msgh_remote_port;
+       switch (MACH_MSGH_BITS_REMOTE(request->ikm_header->msgh_bits)) {

                case MACH_MSG_TYPE_PORT_SEND:
                    ipc_port_release_send(*destp);
                    break;
                case MACH_MSG_TYPE_PORT_SEND:
                    ipc_port_release_send(*destp);
                    break;


@@ -468,13 +379,24 @@ ipc_kobject_server(
                    break;
                
                default:
                    break;
                
                default:

-                   panic("ipc_object_destroy: strange destination rights");
+                   panic("ipc_kobject_server: strange destination rights");

        }
        *destp = IP_NULL;
 
        }
        *destp = IP_NULL;
 

-        if (!(reply->ikm_header.msgh_bits & MACH_MSGH_BITS_COMPLEX) &&
-           ((mig_reply_error_t *) &reply->ikm_header)->RetCode != KERN_SUCCESS)
-               kr = ((mig_reply_error_t *) &reply->ikm_header)->RetCode;
+       /*
+        *      Destroy voucher.  The kernel MIG servers never take ownership
+        *      of vouchers sent in messages.  Swallow any such rights here.
+        */
+       if (IP_VALID(request->ikm_voucher)) {
+               assert(MACH_MSG_TYPE_PORT_SEND ==
+                      MACH_MSGH_BITS_VOUCHER(request->ikm_header->msgh_bits));
+               ipc_port_release_send(request->ikm_voucher);
+               request->ikm_voucher = IP_NULL;
+       }
+
+        if (!(reply->ikm_header->msgh_bits & MACH_MSGH_BITS_COMPLEX) &&
+           ((mig_reply_error_t *) reply->ikm_header)->RetCode != KERN_SUCCESS)
+               kr = ((mig_reply_error_t *) reply->ikm_header)->RetCode;

        else
                kr = KERN_SUCCESS;
 
        else
                kr = KERN_SUCCESS;
 


@@ -494,10 +416,12 @@ ipc_kobject_server(
                 *      Destroy everthing except the reply port right,
                 *      which is needed in the reply message.
                 */
                 *      Destroy everthing except the reply port right,
                 *      which is needed in the reply message.
                 */

-               request->ikm_header.msgh_local_port = MACH_PORT_NULL;
+               request->ikm_header->msgh_local_port = MACH_PORT_NULL;

                ipc_kmsg_destroy(request);
        }
 
                ipc_kmsg_destroy(request);
        }
 

+       replyp = (ipc_port_t)reply->ikm_header->msgh_remote_port;
+

        if (kr == MIG_NO_REPLY) {
                /*
                 *      The server function will send a reply message
        if (kr == MIG_NO_REPLY) {
                /*
                 *      The server function will send a reply message


@@ -506,14 +430,8 @@ ipc_kobject_server(
 
                ipc_kmsg_free(reply);
 
 
                ipc_kmsg_free(reply);
 

-               ETAP_PROBE_DATA(ETAP_P_SYSCALL_MACH,
-                               EVENT_END,
-                               ((thread_t) th),
-                               &request->ikm_header.msgh_id,
-                               sizeof(int));
-

                return IKM_NULL;
                return IKM_NULL;

-       } else if (!IP_VALID((ipc_port_t)reply->ikm_header.msgh_remote_port)) {
+       } else if (!IP_VALID(replyp)) {

                /*
                 *      Can't queue the reply message if the destination
                 *      (the reply port) isn't valid.
                /*
                 *      Can't queue the reply message if the destination
                 *      (the reply port) isn't valid.


@@ -521,27 +439,27 @@ ipc_kobject_server(
 
                ipc_kmsg_destroy(reply);
 
 
                ipc_kmsg_destroy(reply);
 

-               ETAP_PROBE_DATA(ETAP_P_SYSCALL_MACH,
-                               EVENT_END,
-                               ((thread_t) th),
-                               &request->ikm_header.msgh_id,
-                               sizeof(int));
-
+               return IKM_NULL;
+       } else if (replyp->ip_receiver == ipc_space_kernel) {
+               /*
+                * Don't send replies to kobject kernel ports
+                */
+#if DEVELOPMENT || DEBUG
+               printf("%s: refusing to send reply to kobject %d port (id:%d)\n",
+                      __func__, ip_kotype(replyp),
+                      request->ikm_header->msgh_id);
+#endif /* DEVELOPMENT || DEBUG */
+               ipc_kmsg_destroy(reply);

                return IKM_NULL;
        }
 
        trailer = (mach_msg_format_0_trailer_t *)
                return IKM_NULL;
        }
 
        trailer = (mach_msg_format_0_trailer_t *)

-               ((vm_offset_t)&reply->ikm_header + (int)reply->ikm_header.msgh_size);                
+               ((vm_offset_t)reply->ikm_header + (int)reply->ikm_header->msgh_size);
+

        trailer->msgh_sender = KERNEL_SECURITY_TOKEN;
        trailer->msgh_trailer_type = MACH_MSG_TRAILER_FORMAT_0;
        trailer->msgh_trailer_size = MACH_MSG_TRAILER_MINIMUM_SIZE;
 
        trailer->msgh_sender = KERNEL_SECURITY_TOKEN;
        trailer->msgh_trailer_type = MACH_MSG_TRAILER_FORMAT_0;
        trailer->msgh_trailer_size = MACH_MSG_TRAILER_MINIMUM_SIZE;
 

-        ETAP_PROBE_DATA(ETAP_P_SYSCALL_MACH,
-                        EVENT_END,
-                       ((thread_t) th),
-                        &request->ikm_header.msgh_id,
-                        sizeof(int));
-

        return reply;
 }
 
        return reply;
 }
 


@@ -609,69 +527,84 @@ ipc_kobject_destroy(
                mach_destroy_memory_entry(port);
                break;
 
                mach_destroy_memory_entry(port);
                break;
 

-       case IKOT_UPL:
-               mach_destroy_upl(port);
+       case IKOT_HOST_NOTIFY:
+               host_notify_port_destroy(port);

                break;
 
                break;
 

-       default:        /* XXX (bogon) */
-               vm_object_destroy(port);
+       default:

                break;
        }
 }
 
 
                break;
        }
 }
 
 

-extern int vnode_pager_workaround;
-

 boolean_t
 ipc_kobject_notify(
        mach_msg_header_t *request_header,
        mach_msg_header_t *reply_header)
 {
 boolean_t
 ipc_kobject_notify(
        mach_msg_header_t *request_header,
        mach_msg_header_t *reply_header)
 {

+       mach_msg_max_trailer_t * trailer;

        ipc_port_t port = (ipc_port_t) request_header->msgh_remote_port;
        ipc_port_t port = (ipc_port_t) request_header->msgh_remote_port;

-       rpc_subsystem_t         paging_subsystem_object;
-       mach_port_seqno_t       seqno;

 
        ((mig_reply_error_t *) reply_header)->RetCode = MIG_NO_REPLY;
 
        ((mig_reply_error_t *) reply_header)->RetCode = MIG_NO_REPLY;

+
+       trailer = (mach_msg_max_trailer_t *)
+                 ((vm_offset_t)request_header + request_header->msgh_size);
+       if (0 != bcmp(&trailer->msgh_audit, &KERNEL_AUDIT_TOKEN,
+                       sizeof(trailer->msgh_audit))) {
+               return FALSE;
+       }
+       if (0 != bcmp(&trailer->msgh_sender, &KERNEL_SECURITY_TOKEN,
+                       sizeof(trailer->msgh_sender))) {
+               return FALSE;
+       }
+

        switch (request_header->msgh_id) {
                case MACH_NOTIFY_NO_SENDERS:
        switch (request_header->msgh_id) {
                case MACH_NOTIFY_NO_SENDERS:

-                  if(ip_kotype(port) == IKOT_NAMED_ENTRY) {
-                       ip_lock(port);
-
-                       /*
-                        * Bring the sequence number and mscount in
-                        * line with ipc_port_destroy assertion.
-                        */
-                       port->ip_mscount = 0;
-                       port->ip_messages.imq_seqno = 0;
-                       ipc_port_destroy(port); /* releases lock */
-                       return TRUE;
-                  }
-                  paging_subsystem_object = pager_mux_hash_lookup(
-                               (ipc_port_t)request_header->msgh_remote_port);
-                  if(paging_subsystem_object == (rpc_subsystem_t)
-                                       &dp_memory_object_subsystem) {
-                     default_pager_no_senders(
-                        (ipc_port_t)request_header->msgh_remote_port, 
-                        seqno, 
-                        (mach_port_mscount_t) 
-                        ((mach_no_senders_notification_t *) 
-                        request_header)->not_count);
-                     (ipc_port_t)reply_header->msgh_remote_port
-                         = MACH_PORT_NULL;
-                     return TRUE;
-                  }
-                  if(paging_subsystem_object == (rpc_subsystem_t)
-                                       &vnode_pager_workaround) {
-                     vnode_pager_no_senders(
-                        (ipc_port_t)request_header->msgh_remote_port, 
-                        (mach_port_mscount_t) 
-                        ((mach_no_senders_notification_t *) 
-                        request_header)->not_count);
-                     (ipc_port_t)reply_header->msgh_remote_port
-                         = MACH_PORT_NULL;
-                     return TRUE;
-                  }
+                       switch (ip_kotype(port)) {
+                       case IKOT_VOUCHER:
+                               ipc_voucher_notify(request_header);
+                               return TRUE;
+
+                       case IKOT_VOUCHER_ATTR_CONTROL:
+                               ipc_voucher_attr_control_notify(request_header);
+                               return TRUE;
+
+                       case IKOT_SEMAPHORE:
+                               semaphore_notify(request_header);
+                               return TRUE;
+                               
+                       case IKOT_NAMED_ENTRY:
+                               ip_lock(port);
+
+                               /*
+                                * Bring the sequence number and mscount in
+                                * line with ipc_port_destroy assertion.
+                                */
+                               port->ip_mscount = 0;
+                               port->ip_messages.imq_seqno = 0;
+                               ipc_port_destroy(port); /* releases lock */
+                               return TRUE;
+
+                       case IKOT_UPL:
+                               upl_no_senders(
+                                       request_header->msgh_remote_port, 
+                                       (mach_port_mscount_t) 
+                                       ((mach_no_senders_notification_t *) 
+                                        request_header)->not_count);
+                               reply_header->msgh_remote_port = MACH_PORT_NULL;
+                               return TRUE;
+
+#if    CONFIG_AUDIT
+                       case IKOT_AU_SESSIONPORT:
+                               audit_session_nosenders(request_header);
+                               return TRUE;
+#endif
+                       case IKOT_FILEPORT:
+                               fileport_notify(request_header);
+                               return TRUE;
+                       }

                   break;
                   break;

+

                case MACH_NOTIFY_PORT_DELETED:
                case MACH_NOTIFY_PORT_DESTROYED:
                case MACH_NOTIFY_SEND_ONCE:
                case MACH_NOTIFY_PORT_DELETED:
                case MACH_NOTIFY_PORT_DESTROYED:
                case MACH_NOTIFY_SEND_ONCE:


@@ -688,77 +621,15 @@ ipc_kobject_notify(
                case IKOT_IOKIT_CONNECT:
                case IKOT_IOKIT_SPARE:
                {
                case IKOT_IOKIT_CONNECT:
                case IKOT_IOKIT_SPARE:
                {

-                extern boolean_t iokit_notify( mach_msg_header_t *msg);
-

                 return iokit_notify(request_header);
                }
 #endif
                 return iokit_notify(request_header);
                }
 #endif

+               case IKOT_TASK_RESUME:
+               {
+                       return task_suspension_notify(request_header);
+               }
+

                default:
                 return FALSE;
         }
 }
                default:
                 return FALSE;
         }
 }

-
-
-
-#include <mach_kdb.h>
-#if    MACH_COUNTERS && MACH_KDB
-
-#include <ddb/db_output.h>
-#include <ddb/db_sym.h>
-
-#define printf  kdbprintf
-
-extern void kobjserver_stats(void);
-extern void bucket_stats_print(mig_hash_t *bucket);
-
-extern void kobjserver_stats_clear(void);
-
-
-void
-kobjserver_stats_clear(void)
-{
-       int i;
-       for (i = 0; i < MAX_MIG_ENTRIES; i++) {
-               mig_buckets[i].callcount = 0;
-       }
-}
-
-void
-kobjserver_stats(void)
-{
-    register unsigned int i, n = sizeof(mig_e)/sizeof(rpc_subsystem_t);
-    register unsigned int howmany;
-    register mach_msg_id_t j, pos, nentry, range;
-       
-    db_printf("Kobject server call counts:\n");
-    for (i = 0; i < n; i++) {
-       db_printf("  ");
-       db_printsym((vm_offset_t)mig_e[i], DB_STGY_ANY);
-       db_printf(":\n");
-       range = mig_e[i]->end - mig_e[i]->start;
-       if (!mig_e[i]->start || range < 0) continue;
-
-       for  (j = 0; j < range; j++) {
-           nentry = j + mig_e[i]->start;       
-           for (pos = MIG_HASH(nentry) % MAX_MIG_ENTRIES, howmany = 1;
-                mig_buckets[pos].num;
-                pos = ++pos % MAX_MIG_ENTRIES, howmany++) {
-                   if (mig_buckets[pos].num == nentry)
-                       bucket_stats_print(&mig_buckets[pos]);
-           }
-       }
-    }
-}
-
-void
-bucket_stats_print(mig_hash_t *bucket)
-{
-       if (bucket->callcount) {
-               db_printf("    ");
-               db_printsym((vm_offset_t)bucket->routine, DB_STGY_ANY);
-               db_printf(" (%d):\t%d\n", bucket->num, bucket->callcount);
-       }
-}
-
-
-#endif /* MACH_COUNTERS && MACH_KDB */