diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-10-28 12:55:24 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-10-28 12:55:24 +0100 |
| commit | 62c482e93f407bcc7971547742094301374b841e (patch) | |
| tree | 930f36f9263b5d02c176d6b13b0ed5a762c8fd83 | |
| parent | 32ad5b3328e0ce53ca27e185a89ca44c1d0acd0c (diff) | |
| download | glibc-62c482e93f407bcc7971547742094301374b841e.tar.gz glibc-62c482e93f407bcc7971547742094301374b841e.tar.xz glibc-62c482e93f407bcc7971547742094301374b841e.zip | |
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | hurd/intr-msg.c | 3 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/intr-msg.h | 11 |
3 files changed, 12 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 365ca361be..5709c3cdbc 100644 --- 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 c347d9020f..7ace0a16b3 100644 --- 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 baa9ba9171..7788c3b892 100644 --- 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; \ |