(dl_main): Install link maps for preloaded objects using main_map as loader.

diff --git a/elf/rtld.c b/elf/rtld.c
index c69584856f02b6137befba278637999c4a3a37a2..492504b30380ea60e6cbb089ba3ea11455b6f414 100644 (file)
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -368,8 +368,8 @@ of this helper program; chances are you did not intend to run this program.\n",
       while ((p = strsep (&list, " :")) != NULL)
        if (! __libc_enable_secure || strchr (p, '/') == NULL)
          {
-           struct link_map *new_map = _dl_map_object (NULL, p, 1, lt_library,
-                                                      0);
+           struct link_map *new_map = _dl_map_object (main_map, p, 1,
+                                                      lt_library, 0);
            if (new_map->l_opencount == 1)
              /* It is no duplicate.  */
              ++npreloads;
@@ -431,7 +431,7 @@ of this helper program; chances are you did not intend to run this program.\n",
          runp = file + strspn (file, ": \t\n");
          while ((p = strsep (&runp, ": \t\n")) != NULL)
            {
-             struct link_map *new_map = _dl_map_object (NULL, p, 1,
+             struct link_map *new_map = _dl_map_object (main_map, p, 1,
                                                         lt_library, 0);
              if (new_map->l_opencount == 1)
                /* It is no duplicate.  */
@@ -445,7 +445,7 @@ of this helper program; chances are you did not intend to run this program.\n",
       if (problem != NULL)
        {
          char *p = strndupa (problem, file_size - (problem - file));
-         struct link_map *new_map = _dl_map_object (NULL, p, 1,
+         struct link_map *new_map = _dl_map_object (main_map, p, 1,
                                                     lt_library, 0);
          if (new_map->l_opencount == 1)
            /* It is no duplicate.  */