Changeset 87b52c9 in mainline for kernel/generic/src/mm

Timestamp:

2011-04-01T11:34:41Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

66a54cc

Parents:

df3ad97 (diff), 27bdfa5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from usb/development

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)) &&
-            (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)