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

Timestamp:

2025-02-13T10:16:55Z (7 days ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

286c4b0, f455de0

Parents:

a7a16a2f

git-author:

Matěj Volf <git@…> (2025-02-13 10:16:55)

git-committer:

GitHub <noreply@…> (2025-02-13 10:16:55)

Message:

init RTLD runtime at load time even for statically linked binaries (#242)

init RTLD runtime at load time even for statically linked binaries

File:

• uspace/lib/c/generic/elf/elf_load.c (modified) (1 diff)

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

@@ -60 +60 @@
         rtld_t *env;
 #endif
-        errno_t rc;
+        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);
+                DPRINTF("Failed to load executable.\n");
                 return rc;
         }
 
+#ifdef CONFIG_RTLD
+        DPRINTF("- prog dynamic: %p\n", finfo->dynamic);
+        rc = rtld_prog_process(finfo, &env);
+        if (rc != EOK) {
+                DPRINTF("Failed to process executable.\n");
+                return rc;
+        }
+        info->env = env;
+        return EOK;
+#else
         if (info->finfo.dynamic == NULL) {
-                /* Statically linked program */
-                DPRINTF("Binary is statically linked.\n");
                 info->env = NULL;
                 return EOK;
         }
 
-        DPRINTF("Binary is dynamically linked.\n");
-#ifdef CONFIG_RTLD
-        DPRINTF("- prog dynamic: %p\n", info->finfo.dynamic);
-
-        rc = rtld_prog_process(&info->finfo, &env);
-        info->env = env;
-#else
-        rc = ENOTSUP;
+        DPRINTF("Error: trying to run a dynamically-linked executable with CONFIG_RTLD disabled.\n");
+        return ENOTSUP;
 #endif
-        return rc;
 }