* [hurd,commited] hurd: Fix pthread_kill on exiting/ted thread
@ 2022-01-15 14:12 Samuel Thibault
0 siblings, 0 replies; only message in thread
From: Samuel Thibault @ 2022-01-15 14:12 UTC (permalink / raw)
To: libc-alpha; +Cc: Samuel Thibault, commit-hurd
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.
---
sysdeps/hurd/htl/pt-kill.c | 4 ++++
sysdeps/mach/htl/pt-thread-terminate.c | 3 +++
2 files changed, 7 insertions(+)
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,
--
2.34.1
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-01-15 14:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-15 14:12 [hurd,commited] hurd: Fix pthread_kill on exiting/ted thread Samuel Thibault
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).