Changeset 57d44dd in mainline for uspace

Timestamp:

2018-04-10T18:51:14Z (7 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.

Location:

uspace

Files:

• lib/c/generic/elf/elf_mod.c (modified) (1 diff)
• lib/c/include/elf/elf_mod.h (modified) (1 diff)
• srv/loader/Makefile (modified) (1 diff)
• srv/loader/interp.S (deleted)

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:

uspace/lib/c/include/elf/elf_mod.h

@@ -51 +51 @@
 #define EE_INCOMPATIBLE         3       /* ELF image is not compatible with current architecture */
 #define EE_UNSUPPORTED          4       /* Non-supported ELF (e.g. dynamic ELFs) */
-#define EE_LOADER               5       /* The image is actually a program loader. */
-#define EE_IRRECOVERABLE        6
-#define EE_IO                   7       /* Could not read file. */
+#define EE_IRRECOVERABLE        5
+#define EE_IO                   6       /* Could not read file. */
 
 typedef enum {

uspace/srv/loader/Makefile

@@ -36 +36 @@
 
 GENERIC_SOURCES = \
-        main.c \
-        interp.S
+        main.c
 
 SOURCES = \