From owner-freebsd-current@FreeBSD.ORG Sat Mar 28 13:47:46 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8283110656DB for ; Sat, 28 Mar 2009 13:47:46 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.terabit.net.ua (mail.terabit.net.ua [195.137.202.147]) by mx1.freebsd.org (Postfix) with ESMTP id 27BBF8FC13 for ; Sat, 28 Mar 2009 13:47:46 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from skuns.zoral.com.ua ([91.193.166.194] helo=mail.zoral.com.ua) by mail.terabit.net.ua with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63 (FreeBSD)) (envelope-from ) id 1LnYsy-000DCp-4c; Sat, 28 Mar 2009 15:47:44 +0200 Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id n2SDlf3J095198 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 28 Mar 2009 15:47:41 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.3/8.14.3) with ESMTP id n2SDlfh3043011; Sat, 28 Mar 2009 15:47:41 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.3/8.14.3/Submit) id n2SDlfSE043010; Sat, 28 Mar 2009 15:47:41 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 28 Mar 2009 15:47:40 +0200 From: Kostik Belousov To: Ed Schouten Message-ID: <20090328134740.GI31897@deviant.kiev.zoral.com.ua> References: <20090328102552.GR73108@hoeg.nl> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="OkEUgNLVrkMgtt3o" Content-Disposition: inline In-Reply-To: <20090328102552.GR73108@hoeg.nl> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: ClamAV version 0.94.2, clamav-milter version 0.94.2 on skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua X-Virus-Scanned: mail.terabit.net.ua 1LnYsy-000DCp-4c 161e94a6d6f4157ba41e96a2ed7f2e0f X-Terabit: YES Cc: FreeBSD Current Subject: Re: LD_PRELOAD broken? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Mar 2009 13:47:47 -0000 --OkEUgNLVrkMgtt3o Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Mar 28, 2009 at 11:25:52AM +0100, Ed Schouten wrote: > Hi all, >=20 > Is it possible that the changes to rtld-elf the last couple of weeks > cause LD_PRELOAD to crash applications on startup? Very simple way to > reproduce: >=20 > LD_PRELOAD=3D/lib/libc.so.7 ls >=20 > This causes a segmentation fault on startup, at least on AMD64. Yes. The following fixes the case for me. diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 823427a..d98ade7 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1125,7 +1125,7 @@ find_library(const char *xname, const Obj_Entry *refo= bj) xname); return NULL; } - if (refobj->z_origin) + if (refobj !=3D NULL && refobj->z_origin) return origin_subst(xname, refobj->origin_path); else return xstrdup(xname); --OkEUgNLVrkMgtt3o Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAknOKnwACgkQC3+MBN1Mb4j8JQCg2jXJ6FVuBM/YnVBg3ghKdEbB aoAAoJiA1wJgIfXunExSEXi1UVA0kW5U =DqFT -----END PGP SIGNATURE----- --OkEUgNLVrkMgtt3o--