diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-01-15 14:55:23 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-01-15 15:11:54 +0100 |
| commit | 2c040d0b904ca8dfd34e72dc9b4722d92436ad7e (patch) | |
| tree | ba9372d28e193bbabf4ba63cf7024748eb33b8e1 | |
| parent | dfb204d87fd7d44b90aef377e6442646d9e1318d (diff) | |
| download | glibc-2c040d0b904ca8dfd34e72dc9b4722d92436ad7e.tar.gz | |
hurd: Fix pthread_kill on exiting/ted thread
We have to drop the kernel_thread port from the thread structure, to
avoid pthread_kill's call to _hurd_thread_sigstate trying to reference
it and fail.
| -rw-r--r-- | sysdeps/hurd/htl/pt-kill.c | 4 | ||||
| -rw-r--r-- | sysdeps/mach/htl/pt-thread-terminate.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sysdeps/hurd/htl/pt-kill.c b/sysdeps/hurd/htl/pt-kill.c index c06542b587..b6ee4232a9 100644 --- a/sysdeps/hurd/htl/pt-kill.c +++ b/sysdeps/hurd/htl/pt-kill.c @@ -35,6 +35,10 @@ __pthread_kill (pthread_t thread, int sig) if (pthread == NULL) return ESRCH; + if (pthread->kernel_thread == MACH_PORT_DEAD) + /* The pthread ID is still valid but we cannot send a signal any more. */ + return 0; + ss = _hurd_thread_sigstate (pthread->kernel_thread); assert (ss); diff --git a/sysdeps/mach/htl/pt-thread-terminate.c b/sysdeps/mach/htl/pt-thread-terminate.c index 8bc37b38e4..0cf72b330f 100644 --- a/sysdeps/mach/htl/pt-thread-terminate.c +++ b/sysdeps/mach/htl/pt-thread-terminate.c @@ -68,6 +68,9 @@ __pthread_thread_terminate (struct __pthread *thread) /* The wake up port is now no longer needed. */ __mach_port_destroy (__mach_task_self (), wakeup_port); + /* The kernel thread won't be there any more. */ + thread->kernel_thread = MACH_PORT_DEAD; + /* Terminate and release all that's left. */ err = __thread_terminate_release (kernel_thread, mach_task_self (), kernel_thread, reply_port, |