Changeset 917a8c8 in mainline

Timestamp:

2011-03-30T16:25:30Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

27bdfa5, 73aec008, beb6b3d

Parents:

563b538

Message:

be more robust in ELF backend, add checks (with page faults) instead of asserts

File:

• kernel/generic/src/mm/backend_elf.c (modified) (1 diff)

kernel/generic/src/mm/backend_elf.c

@@ -91 +91 @@
         if (!as_area_check_access(area, access))
                 return AS_PF_FAULT;
-
-        ASSERT(addr >= ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE));
-        ASSERT(addr < entry->p_vaddr + entry->p_memsz);
+        
+        if (addr < ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE))
+                return AS_PF_FAULT;
+        
+        if (addr >= entry->p_vaddr + entry->p_memsz)
+                return AS_PF_FAULT;
+        
         i = (addr - ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) >> PAGE_WIDTH;
         base = (uintptr_t)