about summary refs log tree commit diff
path: root/nptl/allocatestack.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-04-10 22:43:01 -0400
committerUlrich Drepper <drepper@gmail.com>2011-04-10 22:43:01 -0400
commite6c61494125126d2ba77e5d99f83887a2ed49783 (patch)
tree1e1b67f306fd7acb967f9d9df32a0296f2ad9d79 /nptl/allocatestack.c
parentc6489db3bdd6e484edcb34884955110612966997 (diff)
downloadglibc-e6c61494125126d2ba77e5d99f83887a2ed49783.tar.gz
glibc-e6c61494125126d2ba77e5d99f83887a2ed49783.tar.xz
glibc-e6c61494125126d2ba77e5d99f83887a2ed49783.zip
Fix memory leak in TLS of loaded objects.
Diffstat (limited to 'nptl/allocatestack.c')
-rw-r--r--nptl/allocatestack.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 831e98e4ce..ba251b9162 100644
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2007, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -26,6 +26,7 @@
 #include <sys/mman.h>
 #include <sys/param.h>
 #include <dl-sysdep.h>
+#include <dl-tls.h>
 #include <tls.h>
 #include <lowlevellock.h>
 #include <kernel-features.h>
@@ -241,6 +242,10 @@ get_cached_stack (size_t *sizep, void **memp)
 
   /* Clear the DTV.  */
   dtv_t *dtv = GET_DTV (TLS_TPADJ (result));
+  for (size_t cnt = 0; cnt < dtv[-1].counter; ++cnt)
+    if (! dtv[1 + cnt].pointer.is_static
+	&& dtv[1 + cnt].pointer.val != TLS_DTV_UNALLOCATED)
+      free (dtv[1 + cnt].pointer.val);
   memset (dtv, '\0', (dtv[-1].counter + 1) * sizeof (dtv_t));
 
   /* Re-initialize the TLS.  */