From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Sat, 27 Aug 2022 11:38:11 +0000 (+0100)
Subject: git-htl-pthread-self-early
X-Git-Tag: archive/raspbian/2.34-7+rpi1~1^2~72
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=baed6b0ee2d25f2573f3d0fa3094dbd0caa0a805;p=glibc.git

git-htl-pthread-self-early

Will be committed for 2.37

commit 302bf01641d0addebe2aea69b9924bd781f76d81
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Thu Jul 28 22:01:49 2022 +0200

    htl: Let pthread_self and cancellability called early

    When applications redirect some functions they might get called before
    libpthread is fully initialized.  They may still expected pthread_self
    and cancellable functions to work, so cope with such calls in that
    situation.


Gbp-Pq: Topic hurd-i386
Gbp-Pq: Name git-htl-pthread-self-early.diff
---

diff --git a/htl/cancellation.c b/htl/cancellation.c
index 1a7a347fc..7325e8694 100644
--- a/htl/cancellation.c
+++ b/htl/cancellation.c
@@ -25,6 +25,10 @@ int __pthread_enable_asynccancel (void)
   struct __pthread *p = _pthread_self ();
   int oldtype;
 
+  if (___pthread_self == NULL)
+    /* We are not initialized yet, we can't be cancelled anyway.  */
+    return PTHREAD_CANCEL_DEFERRED;
+
   __pthread_mutex_lock (&p->cancel_lock);
   oldtype = p->cancel_type;
   p->cancel_type = PTHREAD_CANCEL_ASYNCHRONOUS;
@@ -39,6 +43,10 @@ void __pthread_disable_asynccancel (int oldtype)
 {
   struct __pthread *p = _pthread_self ();
 
+  if (___pthread_self == NULL)
+    /* We are not initialized yet, we can't be cancelled anyway.  */
+    return;
+
   __pthread_mutex_lock (&p->cancel_lock);
   p->cancel_type = oldtype;
   __pthread_mutex_unlock (&p->cancel_lock);
diff --git a/htl/pt-self.c b/htl/pt-self.c
index c8f671a05..a4fcb79d7 100644
--- a/htl/pt-self.c
+++ b/htl/pt-self.c
@@ -24,7 +24,13 @@
 pthread_t
 __pthread_self (void)
 {
-  struct __pthread *self = _pthread_self ();
+  struct __pthread *self;
+
+  if (___pthread_self == NULL)
+    /* We are not initialized yet, we are the first thread.  */
+    return 1;
+
+  self = _pthread_self ();
   assert (self != NULL);
 
   return self->thread;