replace mach_port_t with mach_port_name_t

This is a cleanup following the introduction of mach_port_name_t.
The same set of changes is applied to all files:
- rename mach_port_t to mach_port_name_t where a port name is used,
- use MACH_PORT_NAME_NULL and MACH_PORT_NAME_DEAD where appropriate,
- use invalid_port_to_name() and invalid_name_to_port() for conversion
  where appropriate,
- use regular copyout() insted of copyout_port() when we deal with
  mach_port_name_t already before copyout,
- use the new helper ipc_kmsg_copyout_object_to_port() when we really
  want to place a port name in the space of a mach_port_t.

* include/mach/notify.h: Likewise
* ipc/ipc_entry.c: Likewise
* ipc/ipc_kmsg.c: Likewise
* ipc/ipc_kmsg.h: Likewise, and add ipc_kmsg_copyout_object_to_port()
* ipc/ipc_marequest.c: Likewise
* ipc/ipc_object.c: Likewise
* ipc/ipc_port.c: Likewise
* ipc/ipc_space.h: Likewise
* ipc/mach_msg.c: Likewise
* ipc/mach_port.c: Likewise
* kern/exception.c: Likewise
* kern/ipc_mig.c: Likewise
Message-Id: <20230116105857.240210-8-luca@orpolo.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/kern/ipc_mig.c b/kern/ipc_mig.c
index aa433614..a1757da3 100644
--- a/kern/ipc_mig.c
+++ b/kern/ipc_mig.c
@@ -597,7 +597,7 @@ syscall_vm_map(
 	if (map == VM_MAP_NULL)
 		return MACH_SEND_INTERRUPTED;
 
-	if (MACH_PORT_VALID(memory_object)) {
+	if (MACH_PORT_NAME_VALID(memory_object)) {
 		result = ipc_object_copyin(current_space(), memory_object,
 					   MACH_MSG_TYPE_COPY_SEND,
 					   (ipc_object_t *) &port);
@@ -606,7 +606,7 @@ syscall_vm_map(
 			return result;
 		}
 	} else
-		port = (ipc_port_t) memory_object;
+		port = (ipc_port_t)invalid_name_to_port(memory_object);
 
 	copyin_address(address, &addr);
 	result = vm_map(map, &addr, size, mask, anywhere,
@@ -683,7 +683,7 @@ kern_return_t syscall_task_create(
 		(void) ipc_kmsg_copyout_object(current_space(),
 					       (ipc_object_t) port,
 					       MACH_MSG_TYPE_PORT_SEND, &name);
-		copyout_port(&name, child_task);
+		copyout(&name, child_task, sizeof(mach_port_name_t));
 	}
 	task_deallocate(t);
 
@@ -733,7 +733,7 @@ kern_return_t syscall_task_set_special_port(
 	if (t == TASK_NULL)
 		return MACH_SEND_INTERRUPTED;
 
-	if (MACH_PORT_VALID(port_name)) {
+	if (MACH_PORT_NAME_VALID(port_name)) {
 		result = ipc_object_copyin(current_space(), port_name,
 					   MACH_MSG_TYPE_COPY_SEND,
 					   (ipc_object_t *) &port);
@@ -742,7 +742,7 @@ kern_return_t syscall_task_set_special_port(
 			return result;
 		}
 	} else
-		port = (ipc_port_t) port_name;
+		port = (ipc_port_t)invalid_name_to_port(port_name);
 
 	result = task_set_special_port(t, which_port, port);
 	if ((result != KERN_SUCCESS) && IP_VALID(port))
@@ -769,7 +769,7 @@ syscall_mach_port_allocate(
 	kr = mach_port_allocate(space, right, &name);
 	if (kr == KERN_SUCCESS)
 	{
-		copyout_port(&name, namep);
+		copyout(&name, namep, sizeof(mach_port_name_t));
 	}
 	is_release(space);
 
@@ -834,7 +834,7 @@ syscall_mach_port_insert_right(
 		return KERN_INVALID_VALUE;
 	}
 
-	if (MACH_PORT_VALID(right)) {
+	if (MACH_PORT_NAME_VALID(right)) {
 		kr = ipc_object_copyin(current_space(), right, rightType,
 				       &object);
 		if (kr != KERN_SUCCESS) {
@@ -842,7 +842,7 @@ syscall_mach_port_insert_right(
 			return kr;
 		}
 	} else
-		object = (ipc_object_t) right;
+		object = (ipc_object_t)invalid_name_to_port(right);
 	newtype = ipc_object_copyin_type(rightType);
 
 	kr = mach_port_insert_right(space, name, (ipc_port_t) object, newtype);