[RFC,v2,6/6] elf/dl-init.c: Skip proxied link map entries in the dl init path

Message ID 20180606181934.2480-7-vivek@collabora.com
State New
Headers show
Series
  • Proof-of-Concept implementation of RTLD_SHARED for dlmopen
Related show

Commit Message

Vivek Das Mohapatra June 6, 2018, 6:19 p.m.
Proxies should not trigger calls to DT_INIT constructors since they're
just shims that point to the real, already loaded and initialised, objects.
---
 elf/dl-init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/elf/dl-init.c b/elf/dl-init.c
index 3e72fa3013..2533afa042 100644
--- a/elf/dl-init.c
+++ b/elf/dl-init.c
@@ -27,8 +27,8 @@  typedef void (*init_t) (int, char **, char **);
 static void
 call_init (struct link_map *l, int argc, char **argv, char **env)
 {
-  if (l->l_init_called)
-    /* This object is all done.  */
+  if (l->l_init_called || l->l_proxy)
+    /* This object is all done, or a proxy (and therefore initless).  */
     return;
 
   /* Avoid handling this constructor again in case we have a circular