diff options
| author | Sergey Bugaev <bugaevc@gmail.com> | 2023-04-20 21:42:19 +0300 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-04-21 03:02:04 +0200 |
| commit | 8e78a2e1d166411a1243e505d036e85e4a7ff17f (patch) | |
| tree | a5d270f3baad166aeed81481a5b39ce71b18497c /sysdeps/mach/hurd/i386 | |
| parent | 88cc282a9a694d3c4f3636d6d518f9f0dac76b73 (diff) | |
| download | glibc-8e78a2e1d166411a1243e505d036e85e4a7ff17f.tar.gz glibc-8e78a2e1d166411a1243e505d036e85e4a7ff17f.tar.xz glibc-8e78a2e1d166411a1243e505d036e85e4a7ff17f.zip | |
hurd: Don't migrate reply port into __init1_tcbhead
Properly differentiate between setting up the real TLS with TLS_INIT_TP, and setting up the early TLS (__init1_tcbhead) in static builds. In the latter case, don't yet migrate the reply port into the TCB, and don't yet set __libc_tls_initialized to 1. This also lets us move the __init1_desc assignment inside _hurd_tls_init (). Fixes cd019ddd892e182277fadd6aedccc57fa3923c8d "hurd: Don't leak __hurd_reply_port0" Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
Diffstat (limited to 'sysdeps/mach/hurd/i386')
| -rw-r--r-- | sysdeps/mach/hurd/i386/tls.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sysdeps/mach/hurd/i386/tls.h b/sysdeps/mach/hurd/i386/tls.h index 0ac8917a95..e124fb10e9 100644 --- a/sysdeps/mach/hurd/i386/tls.h +++ b/sysdeps/mach/hurd/i386/tls.h @@ -136,7 +136,7 @@ __LIBC_NO_TLS (void) special attention since 'errno' is not yet available and if the operation can cause a failure 'errno' must not be touched. */ static inline bool __attribute__ ((unused)) -_hurd_tls_init (tcbhead_t *tcb) +_hurd_tls_init (tcbhead_t *tcb, bool full) { HURD_TLS_DESC_DECL (desc, tcb); thread_t self = __mach_thread_self (); @@ -148,8 +148,9 @@ _hurd_tls_init (tcbhead_t *tcb) tcb->tcb = tcb; /* We always at least start the sigthread anyway. */ tcb->multiple_threads = 1; - /* Take over the reply port we've been using. */ - tcb->reply_port = __hurd_reply_port0; + if (full) + /* Take over the reply port we've been using. */ + tcb->reply_port = __hurd_reply_port0; /* Get the first available selector. */ int sel = -1; @@ -175,15 +176,20 @@ _hurd_tls_init (tcbhead_t *tcb) /* Now install the new selector. */ asm volatile ("mov %w0, %%gs" :: "q" (sel)); - /* This port is now owned by the TCB. */ - __hurd_reply_port0 = MACH_PORT_NULL; + if (full) + /* This port is now owned by the TCB. */ + __hurd_reply_port0 = MACH_PORT_NULL; +#ifndef SHARED + else + __init1_desc = sel; +#endif out: __mach_port_deallocate (__mach_task_self (), self); return success; } -# define TLS_INIT_TP(descr) _hurd_tls_init ((tcbhead_t *) (descr)) +# define TLS_INIT_TP(descr) _hurd_tls_init ((tcbhead_t *) (descr), 1) #else /* defined (SHARED) && !IS_IN (rtld) */ # define __LIBC_NO_TLS() 0 #endif |