Changeset d91488d in mainline for kernel/generic/src/lib/elf.c

Timestamp:

2018-11-21T09:16:16Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a91c555f

Parents:

0705fc5

git-author:

Jiri Svoboda <jiri@…> (2018-11-20 20:14:06)

git-committer:

Jiri Svoboda <jiri@…> (2018-11-21 09:16:16)

Message:

Fix endless loop in elf_share() walking the wrong B+tree. Fix ELF areas shared to a different address than in the originating task.

File:

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

kernel/generic/src/lib/elf.c

@@ -142 +142 @@
 {
         mem_backend_data_t backend_data;
-        backend_data.elf = elf;
-        backend_data.segment = entry;
 
         if (entry->p_align > 1) {
@@ -172 +170 @@
         size_t mem_sz = entry->p_memsz + (entry->p_vaddr - base);
 
+        backend_data.elf_base = base;
+        backend_data.elf = elf;
+        backend_data.segment = entry;
+
         as_area_t *area = as_area_create(as, flags, mem_sz,
             AS_AREA_ATTR_NONE, &elf_backend, &backend_data, &base, 0);