From owner-svn-src-all@FreeBSD.ORG  Thu Sep 15 11:50:09 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9ED7E106564A;
	Thu, 15 Sep 2011 11:50:09 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8F2038FC13;
	Thu, 15 Sep 2011 11:50:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8FBo9Tt072222;
	Thu, 15 Sep 2011 11:50:09 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8FBo99f072220;
	Thu, 15 Sep 2011 11:50:09 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201109151150.p8FBo99f072220@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 15 Sep 2011 11:50:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225582 - head/libexec/rtld-elf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Sep 2011 11:50:09 -0000

Author: kib
Date: Thu Sep 15 11:50:09 2011
New Revision: 225582
URL: http://svn.freebsd.org/changeset/base/225582

Log:
  Use the proper dynamic tls block to calculate the tls variable address
  in case tls data generation was updated.
  
  PR:	misc/160721
  Submitted by:	"Thinker K.F. Li" <thinker codemud net>
  Tested by:	flo
  Approved by:	re (bz)
  MFC after:	1 week

Modified:
  head/libexec/rtld-elf/rtld.c

Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c	Thu Sep 15 11:17:07 2011	(r225581)
+++ head/libexec/rtld-elf/rtld.c	Thu Sep 15 11:50:09 2011	(r225582)
@@ -3370,7 +3370,7 @@ tls_get_addr_common(Elf_Addr** dtvp, int
 	newdtv[1] = tls_max_index;
 	free(dtv);
 	lock_release(rtld_bind_lock, &lockstate);
-	*dtvp = newdtv;
+	dtv = *dtvp = newdtv;
     }
 
     /* Dynamically allocate module TLS if necessary */