Changeset f215c6ef in mainline for uspace/lib/c/generic/elf/elf_load.c

Timestamp:

2025-01-26T21:33:13Z (7 weeks ago)

Author:

Matěj Volf <git@…>

Children:

ea77c2d

Parents:

31ea2a7

git-author:

Matěj Volf <git@…> (2025-01-26 21:04:16)

git-committer:

Matěj Volf <git@…> (2025-01-26 21:33:13)

Message:

properly initialize RTLD runtime for static binaries

this is a better approach than what I did of previous commit

see ​https://github.com/HelenOS/helenos/pull/242 for a lot more context

File:

• uspace/lib/c/generic/elf/elf_load.c (modified) (2 diffs)

uspace/lib/c/generic/elf/elf_load.c

@@ -57 +57 @@
 errno_t elf_load(int file, elf_info_t *info)
 {
+#ifdef CONFIG_RTLD
+        rtld_t *env;
+#endif
         errno_t rc = EOK;
+        elf_finfo_t *finfo = &info->finfo;
 
-        rc = elf_load_file(file, 0, &info->finfo);
+        rc = elf_load_file(file, 0, finfo);
         if (rc != EOK) {
                 DPRINTF("Failed to load executable '%s'.\n", file_name);
@@ -65 +69 @@
         }
 
+        if (info->finfo.dynamic == NULL) {
+                /* Statically linked program */
+                DPRINTF("Binary is statically linked.\n");
+                info->env = NULL;
 #ifdef CONFIG_RTLD
-        rtld_t *env;
-        rc = rtld_prog_process(&info->finfo, &env);
+                rc = rtld_init_static(finfo, &env);
+                info->env = env;
+#endif
+                return EOK;
+        }
+
+        DPRINTF("Binary is dynamically linked.\n");
+#ifdef CONFIG_RTLD
+        DPRINTF("- prog dynamic: %p\n", finfo->dynamic);
+        rc = rtld_prog_process(finfo, &env);
         info->env = env;
 #else