Changeset 5754c31e in mainline

Timestamp:

2018-04-04T17:01:18Z (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:

4618998

Parents:

2c4e1cc

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-04-03 18:23:12)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-04-04 17:01:18)

Message:

We should not attempt to read sections in the ELF file.

File:

• uspace/lib/c/generic/elf/elf_mod.c (modified) (4 diffs)

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

@@ -75 +75 @@
 static unsigned int elf_load_module(elf_ld_t *elf, size_t so_bias);
 static int segment_header(elf_ld_t *elf, elf_segment_header_t *entry);
-static int section_header(elf_ld_t *elf, elf_section_header_t *entry);
 static int load_segment(elf_ld_t *elf, elf_segment_header_t *entry);
 
@@ -183 +182 @@
         }
 
-        if (header->e_shentsize != sizeof(elf_section_header_t)) {
-                DPRINTF("e_shentsize: %u != %zu\n", header->e_shentsize,
-                    sizeof(elf_section_header_t));
-                return EE_INCOMPATIBLE;
-        }
-
         /* Check if the object type is supported. */
         if (header->e_type != ET_EXEC && header->e_type != ET_DYN) {
@@ -217 +210 @@
 
                 ret = segment_header(elf, &segment_hdr);
-                if (ret != EE_OK)
-                        return ret;
-        }
-
-        DPRINTF("Parse sections.\n");
-
-        /* Inspect all section headers and proccess them. */
-        for (i = 0; i < header->e_shnum; i++) {
-                elf_section_header_t section_hdr;
-
-                pos = header->e_shoff + i * sizeof(elf_section_header_t);
-                rc = vfs_read(elf->fd, &pos, &section_hdr,
-                    sizeof(elf_section_header_t), &nr);
-                if (rc != EOK || nr != sizeof(elf_section_header_t)) {
-                        DPRINTF("Read error.\n");
-                        return EE_IO;
-                }
-
-                ret = section_header(elf, &section_hdr);
                 if (ret != EE_OK)
                         return ret;
@@ -428 +402 @@
 }
 
-/** Process section header.
- *
- * @param elf   Loader state.
- * @param entry Segment header.
- *
- * @return EE_OK on success, error code otherwise.
- */
-static int section_header(elf_ld_t *elf, elf_section_header_t *entry)
-{
-        switch (entry->sh_type) {
-        case SHT_PROGBITS:
-                if (entry->sh_flags & SHF_TLS) {
-                        /* .tdata */
-                }
-                break;
-        case SHT_NOBITS:
-                if (entry->sh_flags & SHF_TLS) {
-                        /* .tbss */
-                }
-                break;
-        case SHT_DYNAMIC:
-                /* Record pointer to dynamic section into info structure */
-                elf->info->dynamic =
-                    (void *)((uint8_t *)entry->sh_addr + elf->bias);
-                DPRINTF("Dynamic section found at %p.\n",
-                    (void *) elf->info->dynamic);
-                break;
-        default:
-                break;
-        }
-
-        return EE_OK;
-}
-
 /** @}
  */