AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 12:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Update code to handle the new ABI for sending inlined port rights."

Browse Source 
This reverts commit 7e23b3c2c0.
This commit is contained in:
Samuel Thibault 2023-12-03 02:06:29 +01:00
parent 3e85650423
commit d776a59723
2 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hurd/intr-msg.c
View File

@ -199,28 +199,6 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg,
__vm_deallocate (__mach_task_self (), (vm_address_t) data, length);
}
inline void clean_inlined_ports (mach_port_name_inlined_t *ports)
{
mach_msg_type_number_t i;
switch (name)
{
case MACH_MSG_TYPE_MOVE_SEND:
for (i = 0; i < number; i++)
__mach_port_deallocate (__mach_task_self (), ports[i].name);
if (ty->msgtl_header.msgt_longform)
ty->msgtl_name = MACH_MSG_TYPE_COPY_SEND;
else
ty->msgtl_header.msgt_name = MACH_MSG_TYPE_COPY_SEND;
break;
case MACH_MSG_TYPE_COPY_SEND:
case MACH_MSG_TYPE_MOVE_RECEIVE:
break;
default:
if (MACH_MSG_TYPE_PORT_ANY (name))
assert (! "unexpected port type in interruptible RPC");
}
}
char *data;
if (ty->msgtl_header.msgt_longform)
{
@ -237,11 +215,11 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg,
data = (char *) ty + sizeof (mach_msg_type_t);
}
/* Calculate length of data in bytes. */
const vm_size_t length = ((number * size) + 7) >> 3;
if (ty->msgtl_header.msgt_inline)
{
clean_inlined_ports (data);
/* Calculate length of data in bytes. */
clean_ports_and_memory (data, length, 0);
/* Move to the next argument. */
ty = (void *) PTR_ALIGN_UP (data + length, __alignof__ (uintptr_t));
}

12
mach/msg-destroy.c
View File

@ -108,17 +108,11 @@ __mach_msg_destroy (mach_msg_header_t *msg)
addr = is_inline ? saddr : * (vm_offset_t *) saddr;
if (MACH_MSG_TYPE_PORT_ANY(name)) {
mach_port_t *ports = (mach_port_t *) addr;
mach_msg_type_number_t i;
if (is_inline) {
mach_port_name_inlined_t *inlined_ports = (mach_port_name_inlined_t *)addr;
for (i = 0; i < number; i++)
mach_msg_destroy_port(inlined_ports[i].name, name);
} else {
mach_port_t *ports = (mach_port_t *) addr;
for (i = 0; i < number; i++)
mach_msg_destroy_port(ports[i], name);
}
for (i = 0; i < number; i++)
mach_msg_destroy_port(*ports++, name);
}
if (is_inline) {