Changeset 57d44dd in mainline for kernel/generic/src/lib/elf.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:

• kernel/generic/src/lib/elf.c (modified) (5 diffs)

kernel/generic/src/lib/elf.c

@@ -46 +46 @@
 #include <macros.h>
 #include <arch.h>
+#include <str.h>
 
 #include <lib/elf_load.h>
@@ -58 +59 @@
 };
 
-static int segment_header(elf_segment_header_t *, elf_header_t *, as_t *,
-    unsigned int);
 static int load_segment(elf_segment_header_t *, elf_header_t *, as_t *);
 
@@ -71 +70 @@
  *
  */
-unsigned int elf_load(elf_header_t *header, as_t *as, unsigned int flags)
+unsigned int elf_load(elf_header_t *header, as_t *as)
 {
         /* Identify ELF */
@@ -106 +105 @@
                     header->e_phoff))[i];
 
-                int rc = segment_header(seghdr, header, as, flags);
+                if (seghdr->p_type != PT_LOAD)
+                        continue;
+
+                int rc = load_segment(seghdr, header, as);
                 if (rc != EE_OK)
                         return rc;
@@ -126 +128 @@
 
         return error_codes[rc];
-}
-
-/** Process segment header.
- *
- * @param entry Segment header.
- * @param elf   ELF header.
- * @param as    Address space into wich the ELF is being loaded.
- *
- * @return EE_OK on success, error code otherwise.
- *
- */
-static int segment_header(elf_segment_header_t *entry, elf_header_t *elf,
-    as_t *as, unsigned int flags)
-{
-        switch (entry->p_type) {
-        case PT_NULL:
-        case PT_PHDR:
-        case PT_NOTE:
-                break;
-        case PT_LOAD:
-                return load_segment(entry, elf, as);
-        case PT_TLS:
-                break;
-        case PT_DYNAMIC:
-        case PT_INTERP:
-                // FIXME
-                /*
-                char *interp = (char *) elf + entry->p_offset;
-                if (memcmp((uintptr_t) interp, (uintptr_t) ELF_INTERP_ZSTR,
-                    ELF_INTERP_ZLEN) != 0) {
-                        return EE_UNSUPPORTED;
-                } */
-                if ((flags & ELD_F_LOADER) == 0)
-                        return EE_LOADER;
-                break;
-        case PT_SHLIB:
-        case PT_LOPROC:
-        case PT_HIPROC:
-        default:
-                return EE_UNSUPPORTED;
-        }
-        return EE_OK;
 }