From owner-freebsd-openoffice@FreeBSD.ORG Mon Jun 15 21:08:42 2009 Return-Path: Delivered-To: openoffice@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 119E710659F1; Mon, 15 Jun 2009 21:08:39 +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 A1DF38FC1F; Mon, 15 Jun 2009 21:08:37 +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 1MGJPv-0008cs-EW; Tue, 16 Jun 2009 00:08:35 +0300 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 n5FL8W9j098333 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 16 Jun 2009 00:08:32 +0300 (EEST) (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 n5FL8WOG052254; Tue, 16 Jun 2009 00:08:32 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.3/8.14.3/Submit) id n5FL8VpU052253; Tue, 16 Jun 2009 00:08:31 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 16 Jun 2009 00:08:31 +0300 From: Kostik Belousov To: Maho NAKATA Message-ID: <20090615210831.GT23592@deviant.kiev.zoral.com.ua> References: <1244902235.49065.33.camel@localhost> <20090614.081457.193757375.chat95@mac.com> <20090614094141.GF23592@deviant.kiev.zoral.com.ua> <20090615.054654.71139727.chat95@mac.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="VjP/dwTbBl6I9PQk" Content-Disposition: inline In-Reply-To: <20090615.054654.71139727.chat95@mac.com> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.1 at 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 1MGJPv-0008cs-EW fda1a20805cea38d07072adcf7a2ff5e X-Terabit: YES Cc: kan@freebsd.org, openoffice@freebsd.org Subject: Re: ld.so slight difference Linux and FreeBSD ports/127946 X-BeenThere: freebsd-openoffice@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting OpenOffice to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jun 2009 21:08:46 -0000 --VjP/dwTbBl6I9PQk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 15, 2009 at 05:46:54AM +0900, Maho NAKATA wrote: > Hi Konstantin, >=20 > Your patch rocks! tested on FBSD7/i386 and it works! >=20 > * Small test program works. > * also PR 127946 and Issue 22253 went away. > =20 > Is your patch can be commit to FBSD8 or MFC'ed to 7? After discussion with Alexander, who pointed out that handles returned from dlopen done over non-NULL name shall not search in the namespace of objects opened with RTLD_GLOBAL flag, I modified the patch. Would be nice if you could retest the change below. diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 40ed6ed..54acb8a 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1048,9 +1048,13 @@ dlcheck(void *handle) { Obj_Entry *obj; =20 - for (obj =3D obj_list; obj !=3D NULL; obj =3D obj->next) - if (obj =3D=3D (Obj_Entry *) handle) - break; + if (handle =3D=3D RTLD_HANDLE_FROM_NULL) + obj =3D obj_main; + else { + for (obj =3D obj_list; obj !=3D NULL; obj =3D obj->next) + if (obj =3D=3D (Obj_Entry *) handle) + break; + } =20 if (obj =3D=3D NULL || obj->refcount =3D=3D 0 || obj->dl_refcount =3D= =3D 0) { _rtld_error("Invalid shared object handle %p", handle); @@ -2054,6 +2058,8 @@ dlopen(const char *name, int mode) objlist_call_init(&initlist, &lockstate); objlist_clear(&initlist); wlock_release(rtld_bind_lock, lockstate); + if (name =3D=3D NULL) + obj =3D RTLD_HANDLE_FROM_NULL; return obj; trace: trace_loaded_objects(obj); @@ -2069,7 +2075,7 @@ do_dlsym(void *handle, const char *name, void *retadd= r, const Ver_Entry *ve, const Obj_Entry *obj, *defobj; const Elf_Sym *def, *symp; unsigned long hash; - int lockstate; + int lockstate, search_global; =20 hash =3D elf_hash(name); def =3D NULL; @@ -2079,6 +2085,7 @@ do_dlsym(void *handle, const char *name, void *retadd= r, const Ver_Entry *ve, lockstate =3D rlock_acquire(rtld_bind_lock); if (handle =3D=3D NULL || handle =3D=3D RTLD_NEXT || handle =3D=3D RTLD_DEFAULT || handle =3D=3D RTLD_SELF) { + search_global =3D true; =20 if ((obj =3D obj_from_addr(retaddr)) =3D=3D NULL) { _rtld_error("Cannot determine caller's shared object"); @@ -2120,6 +2127,7 @@ do_dlsym(void *handle, const char *name, void *retadd= r, const Ver_Entry *ve, def =3D symlook_default(name, hash, obj, &defobj, ve, flags); } } else { + search_global =3D (handle =3D=3D RTLD_HANDLE_FROM_NULL); if ((obj =3D dlcheck(handle)) =3D=3D NULL) { rlock_release(rtld_bind_lock, lockstate); return NULL; @@ -2141,6 +2149,11 @@ do_dlsym(void *handle, const char *name, void *retad= dr, const Ver_Entry *ve, &donelist); } } + if (def =3D=3D NULL && search_global) { + donelist_init(&donelist); + def =3D symlook_list(name, hash, &list_global, &defobj, ve, flags, + &donelist); + } =20 if (def !=3D NULL) { rlock_release(rtld_bind_lock, lockstate); diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 2b3b897..b16e57e 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -238,6 +238,9 @@ typedef struct Struct_Obj_Entry { #define SYMLOOK_DLSYM 0x02 /* Return newes versioned symbol. Used by dlsym. */ =20 +/* Handle returned by dlopen(NULL, flags). */ +#define RTLD_HANDLE_FROM_NULL ((void *) -100) + /* * Symbol cache entry used during relocation to avoid multiple lookups * of the same symbol. --VjP/dwTbBl6I9PQk Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAko2uE8ACgkQC3+MBN1Mb4g1AwCfWqH7yVULv1FeF/Ge3+i/IDXT 3h0An1iAiW5aAP8ZB0Pk+/0umWdabXz6 =QGQx -----END PGP SIGNATURE----- --VjP/dwTbBl6I9PQk--