From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <shebs@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2154)
 id B797A3853804; Thu, 15 Jul 2021 20:54:06 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B797A3853804
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Stan Shebs <shebs@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/google/grte/v5-2.27/master] Fix bug where ld.so hashtable
 would retain strings passed to dlopen().
X-Act-Checkin: glibc
X-Git-Author: Ambrose Feinstein <ambrose@google.com>
X-Git-Refname: refs/heads/google/grte/v5-2.27/master
X-Git-Oldrev: c783f269d1acc1fab63f58287743181cc6abda29
X-Git-Newrev: 0ad524ba97cc582049e92ea22550169e161e307a
Message-Id: <20210715205406.B797A3853804@sourceware.org>
Date: Thu, 15 Jul 2021 20:54:06 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jul 2021 20:54:06 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0ad524ba97cc582049e92ea22550169e161e307a

commit 0ad524ba97cc582049e92ea22550169e161e307a
Author: Ambrose Feinstein <ambrose@google.com>
Date:   Thu Jul 15 13:53:47 2021 -0700

    Fix bug where ld.so hashtable would retain strings passed to dlopen().

Diff:
---
 elf/dl-load.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 1ae72aa325..957f1b9b30 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -877,6 +877,7 @@ lib_hash_addname (const char *name, struct link_map *lib)
   *p = n;
 }
 
+/* 'name' must be the exact pointer originally passed to lib_hash_addname(). */
 static void
 lib_hash_delname (const char *name, struct link_map *lib)
 {
@@ -885,8 +886,7 @@ lib_hash_delname (const char *name, struct link_map *lib)
   while (*p)
     {
       struct lib_hash_namenode *n = *p;
-      if (n->hash == hash && n->lib == lib &&
-          (n->name == name || !strcmp (n->name, name))) {
+      if (n->hash == hash && n->lib == lib && n->name == name) {
         *p = n->next;
         free (n);
         return;
@@ -1018,16 +1018,7 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, off_t of
          Just bump its reference count and return it.  */
       __close (fd);
 
-      /* If the name is not in the list of names for this object add
-         it.  */
       free (realname);
-      if (offset == 0)
-        {
-          /* If offset!=0, foo.so/@0x<offset> should be the *only*
-             name for this object. b/20141439.  */
-          add_name_to_object (l, name);
-          lib_hash_addname (name, l);
-        }
 
       return l;
     }