Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 19 Sep 2012 05:20:11 GMT
From:      dfilter@FreeBSD.ORG (dfilter service)
To:        freebsd-bugs@FreeBSD.org
Subject:   Re: bin/171604: commit references a PR
Message-ID:  <201209190520.q8J5KBAd046747@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help 
The following reply was made to PR bin/171604; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/171604: commit references a PR
Date: Wed, 19 Sep 2012 05:11:37 +0000 (UTC)

 Author: kib
 Date: Wed Sep 19 05:11:25 2012
 New Revision: 240686
 URL: http://svn.freebsd.org/changeset/base/240686
 
 Log:
   Do not reference z_nodeflib for !objgiven case, thus fixing LD_PRELOAD
   for a non-absolute path.
   
   PR:	bin/171604
   MFC after:	3 days
 
 Modified:
   head/libexec/rtld-elf/rtld.c
 
 Modified: head/libexec/rtld-elf/rtld.c
 ==============================================================================
 --- head/libexec/rtld-elf/rtld.c	Wed Sep 19 00:27:50 2012	(r240685)
 +++ head/libexec/rtld-elf/rtld.c	Wed Sep 19 05:11:25 2012	(r240686)
 @@ -1429,7 +1429,7 @@ find_library(const char *xname, const Ob
  {
      char *pathname;
      char *name;
 -    bool objgiven;
 +    bool nodeflib, objgiven;
  
      objgiven = refobj != NULL;
      if (strchr(xname, '/') != NULL) {	/* Hard coded pathname */
 @@ -1464,6 +1464,7 @@ find_library(const char *xname, const Ob
  	  (pathname = search_library_path(name, STANDARD_LIBRARY_PATH)) != NULL)
  	    return (pathname);
      } else {
 +	nodeflib = objgiven ? refobj->z_nodeflib : false;
  	if ((objgiven &&
  	  (pathname = search_library_path(name, refobj->rpath)) != NULL) ||
  	  (objgiven && refobj->runpath == NULL && refobj != obj_main &&
 @@ -1471,9 +1472,8 @@ find_library(const char *xname, const Ob
  	  (pathname = search_library_path(name, ld_library_path)) != NULL ||
  	  (objgiven &&
  	  (pathname = search_library_path(name, refobj->runpath)) != NULL) ||
 -	  (pathname = search_library_path(name, gethints(refobj->z_nodeflib)))
 -	  != NULL ||
 -	  (objgiven && !refobj->z_nodeflib &&
 +	  (pathname = search_library_path(name, gethints(nodeflib))) != NULL ||
 +	  (objgiven && !nodeflib &&
  	  (pathname = search_library_path(name, STANDARD_LIBRARY_PATH)) != NULL))
  	    return (pathname);
      }
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

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