Changeset 5a7d9d1 in mainline

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.

Files:

• arch/amd64/include/mm/as.h (modified) (1 diff)
• arch/ia32/include/mm/as.h (modified) (1 diff)
• arch/ia64/include/mm/as.h (modified) (1 diff)
• arch/mips32/include/mm/as.h (modified) (1 diff)
• arch/ppc32/include/mm/as.h (modified) (1 diff)
• arch/sparc64/include/mm/as.h (modified) (1 diff)
• generic/include/macros.h (modified) (1 diff)
• generic/include/mm/as.h (modified) (1 diff)
• generic/src/lib/elf.c (modified) (2 diffs)
• generic/src/mm/as.c (modified) (3 diffs)

arch/amd64/include/mm/as.h

@@ -30 +30 @@
 #define __amd64_AS_H__
 
-#include <arch/types.h>
+#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH      0
 
 #define KERNEL_ADDRESS_SPACE_START_ARCH         (__address) 0xffff800000000000

arch/ia32/include/mm/as.h

@@ -30 +30 @@
 #define __ia32_AS_H__
 
-#include <arch/types.h>
+#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH      0
 
 #define KERNEL_ADDRESS_SPACE_START_ARCH         ((__address) 0x80000000)

arch/ia64/include/mm/as.h

@@ -30 +30 @@
 #define __ia64_AS_H__
 
-#include <arch/types.h>
+#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH      0
 
 #define KERNEL_ADDRESS_SPACE_START_ARCH         (__address) 0xe000000000000000ULL

arch/mips32/include/mm/as.h

@@ -30 +30 @@
 #define __mips32_AS_H__
 
-#include <arch/types.h>
-#include <typedefs.h>
+#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH      0
 
 #define KERNEL_ADDRESS_SPACE_START_ARCH         (__address) 0x80000000

arch/ppc32/include/mm/as.h

@@ -30 +30 @@
 #define __ppc32_AS_H__
 
-#include <arch/types.h>
+#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH      0
 
 #define KERNEL_ADDRESS_SPACE_START_ARCH         ((__address) 0x80000000)

arch/sparc64/include/mm/as.h

@@ -30 +30 @@
 #define __sparc64_AS_H__
 
-#include <arch/types.h>
+#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH      1
 
 #define KERNEL_ADDRESS_SPACE_START_ARCH         (__address) 0x0000000000000000

generic/include/macros.h

@@ -40 +40 @@
 #define max(a,b)        ((a)>(b)?(a):(b))
 
-/* Return true if the interlvals overlap */
-static inline int overlaps(__address s1,size_t sz1, __address s2, size_t sz2)
+/** Return true if the interlvals overlap. */
+static inline int overlaps(__address s1, size_t sz1, __address s2, size_t sz2)
 {
         __address e1 = s1+sz1;

generic/include/mm/as.h

@@ -37 +37 @@
 #include <synch/spinlock.h>
 #include <adt/list.h>
+
+/** Defined to be true if user address space and kernel address space shadow each other. */
+#define KERNEL_ADDRESS_SPACE_SHADOWED   KERNEL_ADDRESS_SPACE_SHADOWED_ARCH
 
 #define KERNEL_ADDRESS_SPACE_START      KERNEL_ADDRESS_SPACE_START_ARCH

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++) {

generic/src/mm/as.c

@@ -52 +52 @@
 #include <debug.h>
 #include <memstr.h>
+#include <macros.h>
 #include <arch.h>
 #include <print.h>
@@ -538 +539 @@
         as_area_t *a;
         
+        /*
+         * We don't want any area to have conflicts with NULL page.
+         */
+        if (overlaps(va, size, NULL, PAGE_SIZE))
+                return false;
+        
         for (cur = as->as_area_head.next; cur != &as->as_area_head; cur = cur->next) {
-                __address start;
-                __address end;
+                __address a_start;
+                size_t a_size;
         
                 a = list_get_instance(cur, as_area_t, link);
@@ -548 +555 @@
                 spinlock_lock(&a->lock);
 
-                start = a->base;
-                end = a->base + a->pages * PAGE_SIZE - 1;
+                a_start = a->base;
+                a_size = a->pages * PAGE_SIZE;
 
                 spinlock_unlock(&a->lock);
 
-                if ((va >= start) && (va <= end)) {
-                        /*
-                         * Tested area is inside another area.
-                         */
-                        return false;
-                }
-                
-                if ((start >= va) && (start < va + size)) {
-                        /*
-                         * Another area starts in tested area.
-                         */
-                        return false;
-                }
-                
-                if ((end >= va) && (end < va + size)) {
-                        /*
-                         * Another area ends in tested area.
-                         */
-                        return false;
-                }
-
+                if (overlaps(va, size, a_start, a_size))
+                        return false;           
+
+        }
+
+        /*
+         * So far, the area does not conflict with other areas.
+         * Check if it doesn't conflict with kernel address space.
+         */      
+        if (!KERNEL_ADDRESS_SPACE_SHADOWED) {
+                return !overlaps(va, size, 
+                        KERNEL_ADDRESS_SPACE_START, KERNEL_ADDRESS_SPACE_END-KERNEL_ADDRESS_SPACE_START);
         }