Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Sep 2011 08:39:20 +0000 (UTC)
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r225726 - stable/8/libexec/rtld-elf
Message-ID:  <201109220839.p8M8dKv0013217@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kib
Date: Thu Sep 22 08:39:20 2011
New Revision: 225726
URL: http://svn.freebsd.org/changeset/base/225726

Log:
  MFC r225582:
  Use the proper dynamic tls block to calculate the tls variable address
  in case tls data generation was updated.
  
  PR:	misc/160721

Modified:
  stable/8/libexec/rtld-elf/rtld.c
Directory Properties:
  stable/8/libexec/rtld-elf/   (props changed)

Modified: stable/8/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/8/libexec/rtld-elf/rtld.c	Thu Sep 22 08:24:33 2011	(r225725)
+++ stable/8/libexec/rtld-elf/rtld.c	Thu Sep 22 08:39:20 2011	(r225726)
@@ -3126,7 +3126,7 @@ tls_get_addr_common(Elf_Addr** dtvp, int
 	newdtv[1] = tls_max_index;
 	free(dtv);
 	wlock_release(rtld_bind_lock, lockstate);
-	*dtvp = newdtv;
+	dtv = *dtvp = newdtv;
     }
 
     /* Dynamically allocate module TLS if necessary */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109220839.p8M8dKv0013217>