xnu-1699.22.73.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 06898cc5f0b03697813c954a562e3d9d83bffbad..8963abea6daef13a9b7aa8782513360a21903911 100644 (file)
--- a/osfmk/kern/ipc_kobject.c
+++ b/osfmk/kern/ipc_kobject.c
@@ -1,16 +1,19 @@
 /*
 /*

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

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @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
  * 
  * 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
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * 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@


@@ -50,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.
+ */

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


@@ -73,16 +83,62 @@
 #include <mach/message.h>
 #include <mach/mig_errors.h>
 #include <mach/notify.h>
 #include <mach/message.h>
 #include <mach/mig_errors.h>
 #include <mach/notify.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/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/task_server.h>
+#if VM32_SUPPORT
+#include <mach/vm32_map_server.h>
+#endif
+#include <mach/thread_act_server.h>

 
 

-#include <kern/etap_macros.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 <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_labelh.h>

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

+#include <vm/vm_protos.h>
+
+#include <security/mac_mach_internal.h>

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


@@ -94,8 +150,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;


@@ -116,73 +170,55 @@ mig_hash_t mig_buckets[MAX_MIG_ENTRIES];
 int mig_table_max_displ;
 mach_msg_size_t mig_reply_size;
 
 int mig_table_max_displ;
 mach_msg_size_t mig_reply_size;
 

+#if CONFIG_MACF
+#include <mach/security_server.h>
+#endif

 
 

-#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 */

 
 
 
 

-mig_subsystem_t mig_e[] = {
-        (mig_subsystem_t)&mach_port_subsystem,
-        (mig_subsystem_t)&mach_host_subsystem,
-        (mig_subsystem_t)&host_priv_subsystem,
-        (mig_subsystem_t)&host_security_subsystem,
-        (mig_subsystem_t)&clock_subsystem,
-        (mig_subsystem_t)&clock_priv_subsystem,
-        (mig_subsystem_t)&processor_subsystem,
-        (mig_subsystem_t)&processor_set_subsystem,
-        (mig_subsystem_t)&is_iokit_subsystem,
-        (mig_subsystem_t)&memory_object_name_subsystem,
-       (mig_subsystem_t)&lock_set_subsystem,
-       (mig_subsystem_t)&ledger_subsystem,
-       (mig_subsystem_t)&semaphore_subsystem,
-       (mig_subsystem_t)&task_subsystem,
-       (mig_subsystem_t)&thread_act_subsystem,
-       (mig_subsystem_t)&vm_map_subsystem,
-       (mig_subsystem_t)&UNDReply_subsystem,
+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 *)&memory_object_name_subsystem,
+       (const struct mig_subsystem *)&lock_set_subsystem,
+       (const struct mig_subsystem *)&ledger_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,

 
 #if     XK_PROXY
 
 #if     XK_PROXY

-        (mig_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

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

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

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

 #endif  /* MCMSG && iPSC860 */
 #endif  /* MCMSG && iPSC860 */

+
+#if CONFIG_MACF
+       (const struct mig_subsystem *)&security_subsystem,
+#endif

 };
 
 void
 mig_init(void)
 {
 };
 
 void
 mig_init(void)
 {

-    register unsigned int i, n = sizeof(mig_e)/sizeof(mig_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;
        
     for (i = 0; i < n; i++) {
        range = mig_e[i]->end - mig_e[i]->start;


@@ -196,7 +232,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");


@@ -237,24 +273,15 @@ 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;
        mach_msg_format_0_trailer_t *trailer;
        register mig_hash_t *ptr;
        ipc_port_t *destp;
        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;
        


@@ -287,8 +314,8 @@ 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)

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


@@ -309,18 +336,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 (!ipc_kobject_notify(request->ikm_header, reply->ikm_header)){

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

-                       request->ikm_header.msgh_id);
+                       request->ikm_header->msgh_id);

 #endif /* MACH_IPC_TEST */
 #endif /* MACH_IPC_TEST */

-                   _MIG_MSGID_INVALID(request->ikm_header.msgh_id);
+                   _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


@@ -340,8 +367,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;


@@ -355,9 +382,9 @@ ipc_kobject_server(
        }
        *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;
+        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;
 


@@ -377,7 +404,7 @@ 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);
        }
 


@@ -389,14 +416,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((ipc_port_t)reply->ikm_header->msgh_remote_port)) {

                /*
                 *      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.


@@ -404,27 +425,16 @@ 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;
        }
 
        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;
 }
 


@@ -447,6 +457,11 @@ ipc_kobject_set(
 {
        ip_lock(port);
        ipc_kobject_set_atomically(port, kobject, type);
 {
        ip_lock(port);
        ipc_kobject_set_atomically(port, kobject, type);

+
+#if CONFIG_MACF_MACH
+       mac_port_label_update_kobject (&port->ip_label, type);
+#endif
+

        ip_unlock(port);
 }
 
        ip_unlock(port);
 }
 


@@ -492,22 +507,28 @@ ipc_kobject_destroy(
                mach_destroy_memory_entry(port);
                break;
 
                mach_destroy_memory_entry(port);
                break;
 

-       default:        /* XXX (bogon) */
+       case IKOT_HOST_NOTIFY:
+               host_notify_port_destroy(port);
+               break;
+
+#if CONFIG_MACF_MACH
+       case IKOT_LABELH:
+               labelh_destroy(port);
+               break;
+#endif
+
+       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)
 {
        ipc_port_t port = (ipc_port_t) request_header->msgh_remote_port;
 boolean_t
 ipc_kobject_notify(
        mach_msg_header_t *request_header,
        mach_msg_header_t *reply_header)
 {
        ipc_port_t port = (ipc_port_t) request_header->msgh_remote_port;

-       mig_subsystem_t         paging_subsystem_object;
-       mach_port_seqno_t       seqno;

 
        ((mig_reply_error_t *) reply_header)->RetCode = MIG_NO_REPLY;
        switch (request_header->msgh_id) {
 
        ((mig_reply_error_t *) reply_header)->RetCode = MIG_NO_REPLY;
        switch (request_header->msgh_id) {


@@ -526,15 +547,24 @@ ipc_kobject_notify(
                   }
                   if (ip_kotype(port) == IKOT_UPL) {
                           upl_no_senders(
                   }
                   if (ip_kotype(port) == IKOT_UPL) {
                           upl_no_senders(

-                               (ipc_port_t)request_header->msgh_remote_port, 
+                               request_header->msgh_remote_port, 

                                (mach_port_mscount_t) 
                                ((mach_no_senders_notification_t *) 
                                 request_header)->not_count);
                                (mach_port_mscount_t) 
                                ((mach_no_senders_notification_t *) 
                                 request_header)->not_count);

-                          (ipc_port_t)reply_header->msgh_remote_port
-                                  = MACH_PORT_NULL;
+                          reply_header->msgh_remote_port = MACH_PORT_NULL;
+                          return TRUE;
+                  }
+#if    CONFIG_AUDIT
+                  if (ip_kotype(port) == IKOT_AU_SESSIONPORT) {
+                          audit_session_nosenders(request_header);

                           return TRUE;
                   }
                           return TRUE;
                   }

-                               
+#endif
+                  if (ip_kotype(port) == IKOT_FILEPORT) {
+                       fileport_notify(request_header);
+                       return TRUE;
+                  }
+

                   break;
 
                case MACH_NOTIFY_PORT_DELETED:
                   break;
 
                case MACH_NOTIFY_PORT_DELETED:


@@ -553,8 +583,6 @@ 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


@@ -591,7 +619,7 @@ kobjserver_stats_clear(void)
 void
 kobjserver_stats(void)
 {
 void
 kobjserver_stats(void)
 {

-    register unsigned int i, n = sizeof(mig_e)/sizeof(mig_subsystem_t);
+    register unsigned int i, n = sizeof(mig_e)/sizeof(struct mig_subsystem);

     register unsigned int howmany;
     register mach_msg_id_t j, pos, nentry, range;
        
     register unsigned int howmany;
     register mach_msg_id_t j, pos, nentry, range;
        


@@ -607,7 +635,7 @@ kobjserver_stats(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)
                        bucket_stats_print(&mig_buckets[pos]);
            }
                    if (mig_buckets[pos].num == nentry)
                        bucket_stats_print(&mig_buckets[pos]);
            }