Changeset 8f6c6264 in mainline

Timestamp:

2011-04-17T20:39:43Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

164c653, a7dbd49

Parents:

3ac69647

Message:

More precise elf_nonanon_pages_get() wrt. elf_page_fault().

File:

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

kernel/generic/src/mm/backend_elf.c

@@ -73 +73 @@
 {
         elf_segment_header_t *entry = area->backend_data.segment;
-        size_t nonanon_pages = ALIGN_DOWN(entry->p_filesz, PAGE_SIZE);
+        uintptr_t first = ALIGN_UP(entry->p_vaddr, PAGE_SIZE);
+        uintptr_t last = ALIGN_DOWN(entry->p_vaddr + entry->p_filesz,
+            PAGE_SIZE);
 
         if (entry->p_flags & PF_W)
                 return 0;
 
-        return nonanon_pages;
+        if (last < first)
+                return 0;
+
+        return last - first;
 }