From owner-svn-src-all@FreeBSD.ORG Thu Sep 15 12:06:30 2011 Return-Path: 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 19B171065670; Thu, 15 Sep 2011 12:06:30 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-gw0-f50.google.com (mail-gw0-f50.google.com [74.125.83.50]) by mx1.freebsd.org (Postfix) with ESMTP id 92BC58FC15; Thu, 15 Sep 2011 12:06:29 +0000 (UTC) Received: by gwj16 with SMTP id 16so2587778gwj.37 for ; Thu, 15 Sep 2011 05:06:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=czBoxPIPXs6hMYnV9stRSWcnQ58jQLIn7PVL2Mg7flk=; b=Ow/XrvlG6/HhsZTsKtlBYIMuaLk6ZgkRukhGuJGoDdXjtCyZtX1dOOm+YA6EVFEMEZ AEyDOKjGYdT5/GEkv1TTOo9vFpy8LFynI0l8Fed74meB/4fFEptgCawMFFioFg/vWCkW lOYKqhRpmH8XU2wd4lNjQZkzdt/Llg47TEdtg= MIME-Version: 1.0 Received: by 10.150.240.14 with SMTP id n14mr1102324ybh.41.1316088388961; Thu, 15 Sep 2011 05:06:28 -0700 (PDT) Sender: pluknet@gmail.com Received: by 10.150.53.2 with HTTP; Thu, 15 Sep 2011 05:06:28 -0700 (PDT) In-Reply-To: <201109151150.p8FBo99f072220@svn.freebsd.org> References: <201109151150.p8FBo99f072220@svn.freebsd.org> Date: Thu, 15 Sep 2011 16:06:28 +0400 X-Google-Sender-Auth: HOnbAgqQLwDwOJMziN9zMnPHNw0 Message-ID: From: Sergey Kandaurov To: Konstantin Belousov Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Sep 2011 12:06:30 -0000 On 15 September 2011 15:50, Konstantin Belousov wrote: > Author: kib > Date: Thu Sep 15 11:50:09 2011 > New Revision: 225582 > URL: http://svn.freebsd.org/changeset/base/225582 > > Log: > =A0Use the proper dynamic tls block to calculate the tls variable address > =A0in case tls data generation was updated. > > =A0PR: =A0 misc/160721 > =A0Submitted by: "Thinker K.F. Li" > =A0Tested by: =A0 =A0flo > =A0Approved by: =A0re (bz) > =A0MFC after: =A0 =A01 week > > Modified: > =A0head/libexec/rtld-elf/rtld.c > > Modified: head/libexec/rtld-elf/rtld.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/libexec/rtld-elf/rtld.c =A0 =A0 =A0 =A0Thu Sep 15 11:17:07 2011 = =A0 =A0 =A0 =A0(r225581) > +++ head/libexec/rtld-elf/rtld.c =A0 =A0 =A0 =A0Thu Sep 15 11:50:09 2011 = =A0 =A0 =A0 =A0(r225582) > @@ -3370,7 +3370,7 @@ tls_get_addr_common(Elf_Addr** dtvp, int > =A0 =A0 =A0 =A0newdtv[1] =3D tls_max_index; > =A0 =A0 =A0 =A0free(dtv); > =A0 =A0 =A0 =A0lock_release(rtld_bind_lock, &lockstate); > - =A0 =A0 =A0 *dtvp =3D newdtv; > + =A0 =A0 =A0 dtv =3D *dtvp =3D newdtv; > =A0 =A0 } > > =A0 =A0 /* Dynamically allocate module TLS if necessary */ > Thanks, this patch fixes immediate /usr/bin/top SIGSEGV used with nss-pam-ldap auth when built with -O2. Tested and patched on 8.1-R. --=20 wbr, pluknet