Changeset 5a7d9d1 in mainline for generic/src/lib/elf.c

Timestamp:

2006-03-17T10:07:28Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4e49572

Parents:

226a654

Message:

More checks for address space area conflicts.

File:

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

generic/src/lib/elf.c

@@ -166 +166 @@
         }
 
-        /*
-         * Check if the segment doesn't interfere with kernel address space.
-         */
-        if (entry->p_vaddr + ALIGN_UP(entry->p_memsz, PAGE_SIZE) >= USER_ADDRESS_SPACE_END)
-                return EE_MEMORY;
-        
         if (entry->p_flags & PF_X)
                 flags |= AS_AREA_EXEC;
@@ -196 +190 @@
         a = as_area_create(as, flags, entry->p_memsz, entry->p_vaddr);
         if (!a)
-                return EE_IRRECOVERABLE;
+                return EE_MEMORY;
         
         for (i = 0; i < SIZE2FRAMES(entry->p_filesz); i++) {