xnu-2050.22.13.tar.gz

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

diff --git a/osfmk/kern/ipc_mig.c b/osfmk/kern/ipc_mig.c
index b437edd9b7bf640d1f0d41c92a1ac86b76e7d44f..5120736756816c260d8a0cd024bfe06e44ae4d68 100644 (file)
--- a/osfmk/kern/ipc_mig.c
+++ b/osfmk/kern/ipc_mig.c
@@ -79,6 +79,7 @@
 #include <ipc/ipc_space.h>
 #include <ipc/ipc_port.h>
 #include <ipc/ipc_pset.h>
+#include <ipc/ipc_notify.h>
 #include <vm/vm_map.h>
 
 #include <libkern/OSAtomic.h>
@@ -115,14 +116,15 @@ mach_msg_send_from_kernel(
        ipc_kmsg_t kmsg;
        mach_msg_return_t mr;
 
-       if (!MACH_PORT_VALID(CAST_MACH_PORT_TO_NAME(msg->msgh_remote_port)))
-               return MACH_SEND_INVALID_DEST;
-
        mr = ipc_kmsg_get_from_kernel(msg, send_size, &kmsg);
        if (mr != MACH_MSG_SUCCESS)
                return mr;
 
-       ipc_kmsg_copyin_from_kernel_legacy(kmsg);
+       mr = ipc_kmsg_copyin_from_kernel_legacy(kmsg);
+       if (mr != MACH_MSG_SUCCESS) {
+               ipc_kmsg_free(kmsg);
+               return mr;
+       }               
 
        mr = ipc_kmsg_send_always(kmsg);
        if (mr != MACH_MSG_SUCCESS) {
@@ -142,14 +144,15 @@ mach_msg_send_from_kernel_proper(
        ipc_kmsg_t kmsg;
        mach_msg_return_t mr;
 
-       if (!MACH_PORT_VALID(CAST_MACH_PORT_TO_NAME(msg->msgh_remote_port)))
-               return MACH_SEND_INVALID_DEST;
-
        mr = ipc_kmsg_get_from_kernel(msg, send_size, &kmsg);
        if (mr != MACH_MSG_SUCCESS)
                return mr;
 
-       ipc_kmsg_copyin_from_kernel(kmsg);
+       mr = ipc_kmsg_copyin_from_kernel(kmsg);
+       if (mr != MACH_MSG_SUCCESS) {
+               ipc_kmsg_free(kmsg);
+               return mr;
+       }
 
        mr = ipc_kmsg_send_always(kmsg);
        if (mr != MACH_MSG_SUCCESS) {
@@ -171,14 +174,16 @@ mach_msg_send_from_kernel_with_options(
        ipc_kmsg_t kmsg;
        mach_msg_return_t mr;
 
-       if (!MACH_PORT_VALID(CAST_MACH_PORT_TO_NAME(msg->msgh_remote_port)))
-               return MACH_SEND_INVALID_DEST;
-
        mr = ipc_kmsg_get_from_kernel(msg, send_size, &kmsg);
        if (mr != MACH_MSG_SUCCESS)
                return mr;
 
-       ipc_kmsg_copyin_from_kernel_legacy(kmsg);
+       mr = ipc_kmsg_copyin_from_kernel_legacy(kmsg);
+       if (mr != MACH_MSG_SUCCESS) {
+               ipc_kmsg_free(kmsg);
+               return mr;
+       }
+               
        mr = ipc_kmsg_send(kmsg, option, timeout_val);
        if (mr != MACH_MSG_SUCCESS) {
                ipc_kmsg_destroy(kmsg);
@@ -252,7 +257,6 @@ mach_msg_rpc_from_kernel_body(
        mach_port_seqno_t seqno;
        mach_msg_return_t mr;
 
-       assert(MACH_PORT_VALID(CAST_MACH_PORT_TO_NAME(msg->msgh_remote_port)));
        assert(msg->msgh_local_port == MACH_PORT_NULL);
 
        mr = ipc_kmsg_get_from_kernel(msg, send_size, &kmsg);
@@ -273,17 +277,20 @@ mach_msg_rpc_from_kernel_body(
        kmsg->ikm_header->msgh_bits |=
                MACH_MSGH_BITS(0, MACH_MSG_TYPE_MAKE_SEND_ONCE);
 
-       ipc_port_reference(reply);
+       ip_reference(reply);
 
 #if IKM_SUPPORT_LEGACY
     if(legacy)
-        ipc_kmsg_copyin_from_kernel_legacy(kmsg);
+        mr = ipc_kmsg_copyin_from_kernel_legacy(kmsg);
     else
-        ipc_kmsg_copyin_from_kernel(kmsg);
+        mr = ipc_kmsg_copyin_from_kernel(kmsg);
 #else
-    ipc_kmsg_copyin_from_kernel(kmsg);
+    mr = ipc_kmsg_copyin_from_kernel(kmsg);
 #endif
-
+    if (mr != MACH_MSG_SUCCESS) {
+           ipc_kmsg_free(kmsg);
+           return mr;
+    }
        mr = ipc_kmsg_send_always(kmsg);
        if (mr != MACH_MSG_SUCCESS) {
                ipc_kmsg_destroy(kmsg);
@@ -296,12 +303,12 @@ mach_msg_rpc_from_kernel_body(
                ip_lock(reply);
                if ( !ip_active(reply)) {
                        ip_unlock(reply);
-                       ipc_port_release(reply);
+                       ip_release(reply);
                        return MACH_RCV_PORT_DIED;
                }
                if (!self->active) {
                        ip_unlock(reply);
-                       ipc_port_release(reply);
+                       ip_release(reply);
                        return MACH_RCV_INTERRUPTED;
                }
 
@@ -329,11 +336,11 @@ mach_msg_rpc_from_kernel_body(
                assert(mr == MACH_RCV_INTERRUPTED);
 
                if (self->handlers) {
-                       ipc_port_release(reply);
+                       ip_release(reply);
                        return(mr);
                }
        }
-       ipc_port_release(reply);
+       ip_release(reply);
 
        /* 
         * Check to see how much of the message/trailer can be received.
@@ -412,7 +419,7 @@ mach_msg_overwrite(
        ipc_kmsg_t kmsg;
        mach_port_seqno_t seqno;
        mach_msg_return_t mr;
-       mach_msg_max_trailer_t *trailer;
+       mach_msg_trailer_size_t trailer_size;
 
        if (option & MACH_SEND_MSG) {
                mach_msg_size_t msg_and_trailer_size;
@@ -446,7 +453,7 @@ mach_msg_overwrite(
                max_trailer->msgh_trailer_type = MACH_MSG_TRAILER_FORMAT_0;
                max_trailer->msgh_trailer_size = MACH_MSG_TRAILER_MINIMUM_SIZE;
        
-               mr = ipc_kmsg_copyin(kmsg, space, map, MACH_PORT_NULL);
+               mr = ipc_kmsg_copyin(kmsg, space, map, FALSE);
                if (mr != MACH_MSG_SUCCESS) {
                        ipc_kmsg_free(kmsg);
                        return mr;
@@ -482,34 +489,28 @@ mach_msg_overwrite(
                        kmsg = self->ith_kmsg;
                        seqno = self->ith_seqno;
 
-                       ipc_object_release(object);
+                       io_release(object);
 
                } while (mr == MACH_RCV_INTERRUPTED);
                if (mr != MACH_MSG_SUCCESS)
                        return mr;
 
-               trailer = (mach_msg_max_trailer_t *) 
-                   ((vm_offset_t)kmsg->ikm_header + kmsg->ikm_header->msgh_size);
-               if (option & MACH_RCV_TRAILER_MASK) {
-                       trailer->msgh_seqno = seqno;
-                       trailer->msgh_context = 
-                               kmsg->ikm_header->msgh_remote_port->ip_context;
-                       trailer->msgh_trailer_size = REQUESTED_TRAILER_SIZE(option);
-               }
 
-               if (rcv_size < (kmsg->ikm_header->msgh_size + trailer->msgh_trailer_size)) {
+               trailer_size = ipc_kmsg_add_trailer(kmsg, space, option, current_thread(), seqno, TRUE,
+                               kmsg->ikm_header->msgh_remote_port->ip_context);
+
+               if (rcv_size < (kmsg->ikm_header->msgh_size + trailer_size)) {
                        ipc_kmsg_copyout_dest(kmsg, space);
                        (void) memcpy((void *) msg, (const void *) kmsg->ikm_header, sizeof *msg);
                        ipc_kmsg_free(kmsg);
                        return MACH_RCV_TOO_LARGE;
                }
 
-               mr = ipc_kmsg_copyout(kmsg, space, map, MACH_PORT_NULL,
-                                     MACH_MSG_BODY_NULL);
+               mr = ipc_kmsg_copyout(kmsg, space, map, MACH_MSG_BODY_NULL);
                if (mr != MACH_MSG_SUCCESS) {
                        if ((mr &~ MACH_MSG_MASK) == MACH_RCV_BODY_ERROR) {
                                ipc_kmsg_put_to_kernel(msg, kmsg,
-                                               kmsg->ikm_header->msgh_size + trailer->msgh_trailer_size);
+                                               kmsg->ikm_header->msgh_size + trailer_size);
                        } else {
                                ipc_kmsg_copyout_dest(kmsg, space);
                                (void) memcpy((void *) msg, (const void *) kmsg->ikm_header, sizeof *msg);
@@ -520,7 +521,7 @@ mach_msg_overwrite(
                }
 
                (void) memcpy((void *) msg, (const void *) kmsg->ikm_header,
-                             kmsg->ikm_header->msgh_size + trailer->msgh_trailer_size);
+                             kmsg->ikm_header->msgh_size + trailer_size);
                ipc_kmsg_free(kmsg);
        }