From: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Fri, 2 Oct 2015 14:31:16 +0000 (-0700)
Subject: For b/20141439, don't add "foo.so" as alternate name for previously loaded "foo.so... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85dc56b95f371996e6930e1e56f6071f118a64ba;p=thirdparty%2Fglibc.git

For b/20141439, don't add "foo.so" as alternate name for previously loaded "foo.so/@0x..."
---

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 1afaddff2aa..20be545401d 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -850,7 +850,10 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, off_t of
 	/* If the name is not in the list of names for this object add
 	   it.  */
 	free (realname);
-	add_name_to_object (l, name);
+	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);
 
 	return l;
       }