diff options
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 7 | ||||
| -rw-r--r-- | nptl/allocatestack.c | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 802abcdbc4..f99dcfb22d 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2011-04-10 Ulrich Drepper <drepper@gmail.com> + + [BZ #12650] + * allocatestack.c (get_cached_stack): Deallocate DTV entries before + clearing memory. + Patch partly by Robert Rex <robert.rex@exasol.com>. + 2011-01-19 Roland McGrath <roland@redhat.com> * pthread_cond_wait.c (__pthread_cond_wait): Fix comment typo. 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. */ |