hurd: Fix cancellation just before RPC call

	* sysdeps/mach/hurd/i386/intr-msg.h (INTR_MSG_TRAP): Set
	intr_port to 0 when canceled.
	* hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Pass intr_port
	address.

diff --git a/ChangeLog b/ChangeLog
index 365ca361beaaa4e99d4c3a6e87dbaf6c543c02e3..5709c3cdbcee45ce85118549482a924d2b825fe4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,11 +5,11 @@
        answer to interrupt_operation, return EIO instead of EINTR.
        * sysdeps/mach/hurd/i386/intr-msg.h (INTR_MSG_TRAP): Make
        _hurd_intr_rpc_msg_about_to global point to start of controlled
-       assembly snippet. Make it check canceled flag again.
-       * hurd/hurdsig.c (_hurdsig_abort_rpcs): Only mutate thread if it passed the
-       _hurd_intr_rpc_msg_about_to point.
+       assembly snippet. Make it check canceled flag.
+       * hurd/hurdsig.c (_hurdsig_abort_rpcs): Only mutate thread if it passed
+       the _hurd_intr_rpc_msg_about_to point.
        * hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Remove comment on mutation
-       issue.
+       issue, remove cancel flag check.
 
 2018-10-26  Joseph Myers  <joseph@codesourcery.com>
 

diff --git a/hurd/intr-msg.c b/hurd/intr-msg.c
index c347d9020f902a2f1a1e4477b565c8acef5976b2..7ace0a16b3ec4db80c4d252bc6628a6e7b55d68b 100644 (file)
--- a/hurd/intr-msg.c
+++ b/hurd/intr-msg.c
@@ -116,7 +116,8 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg,
 
   /* Note that the signal trampoline code might modify our OPTION!  */
   err = INTR_MSG_TRAP (msg, option, send_size,
-                      rcv_size, rcv_name, timeout, notify, &ss->cancel);
+                      rcv_size, rcv_name, timeout, notify,
+                      &ss->cancel, &ss->intr_port);
 
   switch (err)
     {

diff --git a/sysdeps/mach/hurd/i386/intr-msg.h b/sysdeps/mach/hurd/i386/intr-msg.h
index baa9ba917195783e65e432830f11d6328d60a377..7788c3b8923bf7671825b2aca879d013963bdae2 100644 (file)
--- a/sysdeps/mach/hurd/i386/intr-msg.h
+++ b/sysdeps/mach/hurd/i386/intr-msg.h
@@ -23,7 +23,7 @@
 
 /* After _hurd_intr_rpc_msg_about_to we need to make a last check of cancel, in
    case we got interrupted right before _hurd_intr_rpc_msg_about_to.  */
-#define INTR_MSG_TRAP(msg, option, send_size, rcv_size, rcv_name, timeout, notify, cancel_p) \
+#define INTR_MSG_TRAP(msg, option, send_size, rcv_size, rcv_name, timeout, notify, cancel_p, intr_port_p) \
 ({                                                                           \
   error_t err;                                                               \
   asm (".globl _hurd_intr_rpc_msg_about_to\n"                                \
@@ -31,17 +31,18 @@
        ".globl _hurd_intr_rpc_msg_do_trap\n"                                 \
        ".globl _hurd_intr_rpc_msg_in_trap\n"                                 \
        ".globl _hurd_intr_rpc_msg_sp_restored\n"                             \
-       "_hurd_intr_rpc_msg_about_to:   cmpl $0, %4\n"                        \
+       "_hurd_intr_rpc_msg_about_to:   cmpl $0, %5\n"                        \
        "                               jz _hurd_intr_rpc_msg_do\n"           \
-       "                               movl %5, %%eax\n"                     \
+       "                               movl $0, %3\n"                        \
+       "                               movl %6, %%eax\n"                     \
        "                               jmp _hurd_intr_rpc_msg_sp_restored\n" \
        "_hurd_intr_rpc_msg_do:         movl %%esp, %%ecx\n"                  \
-       "                               leal %3, %%esp\n"                     \
+       "                               leal %4, %%esp\n"                     \
        "_hurd_intr_rpc_msg_cx_sp:      movl $-25, %%eax\n"                   \
        "_hurd_intr_rpc_msg_do_trap:    lcall $7, $0 # status in %0\n"        \
        "_hurd_intr_rpc_msg_in_trap:    movl %%ecx, %%esp\n"                  \
        "_hurd_intr_rpc_msg_sp_restored:"                                     \
-       : "=a" (err), "+m" (option), "+m" (timeout)                           \
+       : "=a" (err), "+m" (option), "+m" (timeout), "=m" (*intr_port_p)              \
        : "m" ((&msg)[-1]), "m" (*cancel_p), "i" (EINTR)                              \
        : "ecx");                                                             \
   err;                                                                       \