add msg_user_header_t for user-side msg structure

* include/mach/message.h: use mach_msg_user_header_t only in KERNEL,
  and define it as mach_msh_header_t for user space
* ipc/ipc_kmsg.c: use mach_msg_user_header_t where appropriate
* ipc/ipc_kmsg.h: Likewise
* ipc/mach_msg.c: Likewise
* ipc/mach_msg.h: Likewise
* kern/thread.h: Likewise
Message-Id: <20230116105857.240210-2-luca@orpolo.org>

4 files changed, 12 insertions, 12 deletions

diff --git a/ipc/ipc_kmsg.c b/ipc/ipc_kmsg.c
index efa5a124..55252d46 100644
--- a/ipc/ipc_kmsg.c
+++ b/ipc/ipc_kmsg.c
@@ -499,13 +499,13 @@ ipc_kmsg_free(ipc_kmsg_t kmsg)
 
 mach_msg_return_t
 ipc_kmsg_get(
-	mach_msg_header_t 	*msg,
+	mach_msg_user_header_t 	*msg,
 	mach_msg_size_t 	size,
 	ipc_kmsg_t 		*kmsgp)
 {
 	ipc_kmsg_t kmsg;
 
-	if ((size < sizeof(mach_msg_header_t)) || (size & 3))
+	if ((size < sizeof(mach_msg_user_header_t)) || (size & 3))
 		return MACH_SEND_MSG_TOO_SMALL;
 
 	if (size <= IKM_SAVED_MSG_SIZE) {
@@ -587,7 +587,7 @@ ipc_kmsg_get_from_kernel(
 
 mach_msg_return_t
 ipc_kmsg_put(
-	mach_msg_header_t 	*msg,
+	mach_msg_user_header_t 	*msg,
 	ipc_kmsg_t 		kmsg,
 	mach_msg_size_t 	size)
 {
diff --git a/ipc/ipc_kmsg.h b/ipc/ipc_kmsg.h
index ffda9b5e..16df31f5 100644
--- a/ipc/ipc_kmsg.h
+++ b/ipc/ipc_kmsg.h
@@ -242,13 +242,13 @@ extern void
 ipc_kmsg_free(ipc_kmsg_t);
 
 extern mach_msg_return_t
-ipc_kmsg_get(mach_msg_header_t *, mach_msg_size_t, ipc_kmsg_t *);
+ipc_kmsg_get(mach_msg_user_header_t *, mach_msg_size_t, ipc_kmsg_t *);
 
 extern mach_msg_return_t
 ipc_kmsg_get_from_kernel(mach_msg_header_t *, mach_msg_size_t, ipc_kmsg_t *);
 
 extern mach_msg_return_t
-ipc_kmsg_put(mach_msg_header_t *, ipc_kmsg_t, mach_msg_size_t);
+ipc_kmsg_put(mach_msg_user_header_t *, ipc_kmsg_t, mach_msg_size_t);
 
 extern void
 ipc_kmsg_put_to_kernel(mach_msg_header_t *, ipc_kmsg_t, mach_msg_size_t);
diff --git a/ipc/mach_msg.c b/ipc/mach_msg.c
index f15164a3..221ea975 100644
--- a/ipc/mach_msg.c
+++ b/ipc/mach_msg.c
@@ -89,7 +89,7 @@
 
 mach_msg_return_t
 mach_msg_send(
-	mach_msg_header_t 	*msg,
+	mach_msg_user_header_t 	*msg,
 	mach_msg_option_t 	option,
 	mach_msg_size_t 	send_size,
 	mach_msg_timeout_t 	time_out,
@@ -171,7 +171,7 @@ mach_msg_send(
 
 mach_msg_return_t
 mach_msg_receive(
-	mach_msg_header_t 	*msg,
+	mach_msg_user_header_t 	*msg,
 	mach_msg_option_t 	option,
 	mach_msg_size_t 	rcv_size,
 	mach_port_name_t 	rcv_name,
@@ -286,7 +286,7 @@ mach_msg_receive_continue(void)
 	ipc_thread_t self = current_thread();
 	ipc_space_t space = current_space();
 	vm_map_t map = current_map();
-	mach_msg_header_t *msg = self->ith_msg;
+	mach_msg_user_header_t *msg = self->ith_msg;
 	mach_msg_option_t option = self->ith_option;
 	mach_msg_size_t rcv_size = self->ith_rcv_size;
 	mach_msg_timeout_t time_out = self->ith_timeout;
@@ -380,7 +380,7 @@ mach_msg_receive_continue(void)
 
 mach_msg_return_t
 mach_msg_trap(
-	mach_msg_header_t 	*msg,
+	mach_msg_user_header_t 	*msg,
 	mach_msg_option_t 	option,
 	mach_msg_size_t 	send_size,
 	mach_msg_size_t 	rcv_size,
@@ -1609,7 +1609,7 @@ mach_msg_continue(void)
 	task_t task = thread->task;
 	ipc_space_t space = task->itk_space;
 	vm_map_t map = task->map;
-	mach_msg_header_t *msg = thread->ith_msg;
+	mach_msg_user_header_t *msg = thread->ith_msg;
 	mach_msg_size_t rcv_size = thread->ith_rcv_size;
 	ipc_object_t object = thread->ith_object;
 	ipc_mqueue_t mqueue = thread->ith_mqueue;
diff --git a/ipc/mach_msg.h b/ipc/mach_msg.h
index ee093f8d..2951bcea 100644
--- a/ipc/mach_msg.h
+++ b/ipc/mach_msg.h
@@ -40,11 +40,11 @@
 #include <mach/message.h>
 
 extern mach_msg_return_t
-mach_msg_send(mach_msg_header_t *, mach_msg_option_t,
+mach_msg_send(mach_msg_user_header_t *, mach_msg_option_t,
 	      mach_msg_size_t, mach_msg_timeout_t, mach_port_name_t);
 
 extern mach_msg_return_t
-mach_msg_receive(mach_msg_header_t *, mach_msg_option_t,
+mach_msg_receive(mach_msg_user_header_t *, mach_msg_option_t,
 		 mach_msg_size_t, mach_port_name_t,
 		 mach_msg_timeout_t, mach_port_name_t);