hurd: _hurd_intr_rpc_mach_msg() might not preserve the correct reply port

Calls to mach_msg_trap() that return MACH_SEND_INTERRUPTED modify the message header. A subsequent attempt at sending the message can return EINTR for handling by the caller. Mig generated code (expecting the message header to be unaltered) now fails assertion in __mig_dealloc_reply_port(). Fixed by restoring the altered message header content before reattempting RPC message delivery.
Message-ID: <20260209204213.91782-2-mike@weatherwax.co.uk>
This commit is contained in:
Mike Kelly
2026-02-11 01:03:05 +01:00
committed by Samuel Thibault
parent 98dee6c96f
commit 807b3d5e48
+7
View File
@@ -136,6 +136,13 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg,
}
if (!(option & MACH_SEND_INTERRUPT))
{
m->header.msgh_local_port = rcv_name;
m->header.msgh_remote_port = remote_port;
m->header.msgh_id = msgid;
m->header.msgh_bits = msgh_bits;
/* Restore the two words clobbered by the reply data. */
m->request.data = save_data;
option = user_option;
timeout = user_timeout;
goto message;