Changeset b5e68c8 in mainline for kernel/generic/src/syscall/copy.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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 mainline changes.

File:

• kernel/generic/src/syscall/copy.c (modified) (4 diffs)

kernel/generic/src/syscall/copy.c

@@ -68 +68 @@
         if (!KERNEL_ADDRESS_SPACE_SHADOWED) {
                 if (overlaps((uintptr_t) uspace_src, size,
-                        KERNEL_ADDRESS_SPACE_START, KERNEL_ADDRESS_SPACE_END-KERNEL_ADDRESS_SPACE_START)) {
+                        KERNEL_ADDRESS_SPACE_START,
+                        KERNEL_ADDRESS_SPACE_END - KERNEL_ADDRESS_SPACE_START)) {
                         /*
                          * The userspace source block conflicts with kernel address space.
@@ -75 +76 @@
                 }
         }
+
+#ifdef ADDRESS_SPACE_HOLE_START
+        /*
+         * Check whether the address is outside the address space hole.
+         */
+        if (overlaps((uintptr_t) uspace_src, size, ADDRESS_SPACE_HOLE_START,
+            ADDRESS_SPACE_HOLE_END - ADDRESS_SPACE_HOLE_START))
+                return EPERM;
+#endif
         
         ipl = interrupts_disable();
@@ -109 +119 @@
         if (!KERNEL_ADDRESS_SPACE_SHADOWED) {
                 if (overlaps((uintptr_t) uspace_dst, size,
-                        KERNEL_ADDRESS_SPACE_START, KERNEL_ADDRESS_SPACE_END-KERNEL_ADDRESS_SPACE_START)) {
+                        KERNEL_ADDRESS_SPACE_START,
+                        KERNEL_ADDRESS_SPACE_END - KERNEL_ADDRESS_SPACE_START)) {
                         /*
                          * The userspace destination block conflicts with kernel address space.
@@ -116 +127 @@
                 }
         }
+
+#ifdef ADDRESS_SPACE_HOLE_START
+        /*
+         * Check whether the address is outside the address space hole.
+         */
+        if (overlaps((uintptr_t) uspace_dst, size, ADDRESS_SPACE_HOLE_START,
+            ADDRESS_SPACE_HOLE_END - ADDRESS_SPACE_HOLE_START))
+                return EPERM;
+#endif
         
         ipl = interrupts_disable();