Changeset 31ea2a7 in mainline for uspace/lib/c/generic/rtld

Timestamp:

2025-01-26T17:53:49Z (14 months ago)

Author:

Matěj Volf <git@…>

Children:

f215c6ef

Parents:

eff458d

git-author:

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

git-committer:

Matěj Volf <git@…> (2025-01-26 17:53:49)

Message:

init RTLD runtime at load time even for statically linked binaries

before this, main_fibril of a statically linked binary had wrong thread-local storage

please see PR description for an elaborate explanation of what and why was wrong

File:

• uspace/lib/c/generic/rtld/rtld.c (modified) (5 diffs)

uspace/lib/c/generic/rtld/rtld.c

@@ -45 +45 @@
 static rtld_t rt_env_static;
 
-/** Initialize the runtime linker for use in a statically-linked executable. */
+/** Initialize a minimal runtime linker environment for use in executables loaded directly by kernel. */
 errno_t rtld_init_static(void)
 {
@@ -65 +65 @@
 }
 
-/** Initialize and process a dynamically linked executable.
+/** Initialize and process an executable, static or dynamic.
  *
  * @param p_info Program info
@@ -75 +75 @@
         module_t *prog;
 
-        DPRINTF("Load dynamically linked program.\n");
+        DPRINTF("Load program with rtld.\n");
 
         /* Allocate new RTLD environment to pass to the loaded program */
@@ -95 +95 @@
          */
 
-        DPRINTF("Parse program .dynamic section at %p\n", p_info->dynamic);
-        dynamic_parse(p_info->dynamic, 0, &prog->dyn);
+        if (p_info->dynamic) {
+                DPRINTF("Parse program .dynamic section at %p\n", p_info->dynamic);
+                dynamic_parse(p_info->dynamic, 0, &prog->dyn);
+        } else {
+                DPRINTF("Program is statically linked\n");
+        }
         prog->bias = 0;
         prog->dyn.soname = "[program]";
@@ -124 +128 @@
          */
 
-        DPRINTF("Load all program dependencies\n");
-        errno_t rc = module_load_deps(prog, 0);
-        if (rc != EOK) {
-                return rc;
+        if (p_info->dynamic) {
+                DPRINTF("Load all program dependencies\n");
+                errno_t rc = module_load_deps(prog, 0);
+                if (rc != EOK) {
+                        free(prog);
+                        free(env);
+                        return rc;
+                }
         }