From: Florian Weimer <fweimer@redhat.com>
Date: Tue, 19 May 2020 09:03:11 +0000 (+0200)
Subject: nptl: Destroy the default thread attribute as part of freeres
X-Git-Tag: glibc-2.32~270
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6993670b52daa413717e840dfb17b5322e7f4a88;p=thirdparty%2Fglibc.git

nptl: Destroy the default thread attribute as part of freeres

This avoids a spurious memory leak report by valgrind.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
---

diff --git a/nptl/nptlfreeres.c b/nptl/nptlfreeres.c
index dda11e59225..07aa34adfa6 100644
--- a/nptl/nptlfreeres.c
+++ b/nptl/nptlfreeres.c
@@ -25,6 +25,7 @@
 void
 __libpthread_freeres (void)
 {
+  call_function_static_weak (__default_pthread_attr_freeres);
   call_function_static_weak (__nptl_stacks_freeres);
   call_function_static_weak (__shm_directory_freeres);
   call_function_static_weak (__nptl_unwind_freeres);
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index acc8e88e4a2..ed30b729238 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -201,6 +201,8 @@ enum
 /* Default pthread attributes.  */
 extern union pthread_attr_transparent __default_pthread_attr attribute_hidden;
 extern int __default_pthread_attr_lock attribute_hidden;
+/* Called from __libpthread_freeres to deallocate the default attribute.  */
+extern void __default_pthread_attr_freeres (void) attribute_hidden;
 
 /* Size and alignment of static TLS block.  */
 extern size_t __static_tls_size attribute_hidden;
diff --git a/nptl/pthread_setattr_default_np.c b/nptl/pthread_setattr_default_np.c
index c4cfb4e8efa..7a1c644334e 100644
--- a/nptl/pthread_setattr_default_np.c
+++ b/nptl/pthread_setattr_default_np.c
@@ -81,3 +81,13 @@ pthread_setattr_default_np (const pthread_attr_t *in)
   lll_unlock (__default_pthread_attr_lock, LLL_PRIVATE);
   return ret;
 }
+
+/* This is placed in the same file as pthread_setattr_default_np
+   because only this function can trigger allocation of attribute
+   data.  This way, the function is automatically defined for all the
+   cases when it is needed in static builds.  */
+void
+__default_pthread_attr_freeres (void)
+{
+  __pthread_attr_destroy (&__default_pthread_attr.external);
+}