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

Timestamp:

2025-03-02T20:02:33Z (5 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

8cdf360

Parents:

7debda3 (diff), 4285f384 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 'upstream/master' into helenraid-para

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;
 }