From 641973f5bb2a6fe59ba2679684e1229e4a9290a0 Mon Sep 17 00:00:00 2001 From: kib Date: Thu, 22 Sep 2011 08:39:20 +0000 Subject: [PATCH] MFC r225582: Use the proper dynamic tls block to calculate the tls variable address in case tls data generation was updated. PR: misc/160721 git-svn-id: svn://svn.freebsd.org/base/stable/8@225726 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- libexec/rtld-elf/rtld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 07dd2f399..188c70628 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -3126,7 +3126,7 @@ tls_get_addr_common(Elf_Addr** dtvp, int index, size_t offset) newdtv[1] = tls_max_index; free(dtv); wlock_release(rtld_bind_lock, lockstate); - *dtvp = newdtv; + dtv = *dtvp = newdtv; } /* Dynamically allocate module TLS if necessary */ -- 2.45.0