Changeset 57d44dd in mainline for uspace/lib/c/generic/elf/elf_mod.c

Timestamp:

2018-04-10T18:51:14Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

20287223

Parents:

e3f819f

Message:

Instead of using .interp section, determine loader by name.

File:

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

uspace/lib/c/generic/elf/elf_mod.c

@@ -268 +268 @@
                 break;
         case PT_INTERP:
-                /* Assume silently interp == "/app/dload" */
-                elf->info->interp = "/app/dload";
+                elf->info->interp =
+                    (void *)((uint8_t *)entry->p_vaddr + elf->bias);
+
+                // FIXME: This actually won't work, because the text segment is
+                // not loaded yet.
+                #if 0
+                if (elf->info->interp[entry->p_filesz - 1] != '\0') {
+                        DPRINTF("Unterminated ELF interp string.\n");
+                        return EE_INVALID;
+                }
+                DPRINTF("interpreter: \"%s\"\n", elf->info->interp);
+                #endif
                 break;
         case PT_DYNAMIC: