From 85dc56b95f371996e6930e1e56f6071f118a64ba Mon Sep 17 00:00:00 2001 From: Paul Pluzhnikov Date: Fri, 2 Oct 2015 07:31:16 -0700 Subject: [PATCH] For b/20141439, don't add "foo.so" as alternate name for previously loaded "foo.so/@0x..." --- elf/dl-load.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 should be the *only* + name for this object. b/20141439. */ + add_name_to_object (l, name); return l; } -- 2.47.2