[glibc/google/grte/v5-2.27/master] Fix bug where ld.so hashtable would retain strings passed to dlopen().

[glibc/google/grte/v5-2.27/master] Fix bug where ld.so hashtable would retain strings passed to dlopen().

[Stan Shebs]

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;
     }

[glibc/google/grte/v5-2.27/master] Fix bug where ld.so hashtable would retain strings passed to dlopen().

[Fangrui Song]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=22d31aef9ef4cad63fa5cc2e92e3cde403b97948

commit 22d31aef9ef4cad63fa5cc2e92e3cde403b97948
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;
     }