diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-04-11 03:43:01 +0100 |
|---|---|---|
| committer | Petr Baudis <pasky@ucw.cz> | 2011-05-27 00:34:07 +0200 |
| commit | fea332e16416691310088b5c0e6797694c88352b (patch) | |
| tree | 23bfe8977921ff52ed874beb4e74e5dba2587262 /nptl/allocatestack.c | |
| parent | 4e43f00fc3df9757f86bc82292e6d4ca7ccd701d (diff) | |
| download | glibc-fea332e16416691310088b5c0e6797694c88352b.tar.gz glibc-fea332e16416691310088b5c0e6797694c88352b.tar.xz glibc-fea332e16416691310088b5c0e6797694c88352b.zip | |
Fix memory leak in TLS of loaded objects.
(cherry picked from commit e6c61494125126d2ba77e5d99f83887a2ed49783)
Diffstat (limited to 'nptl/allocatestack.c')
| -rw-r--r-- | nptl/allocatestack.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c index 3c3585fe37..550a8bec73 100644 --- a/nptl/allocatestack.c +++ b/nptl/allocatestack.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002-2007, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2002-2007, 2009, 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> @@ -238,6 +239,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. */ |