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

Timestamp:

2019-06-17T15:12:44Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

64b7854

Parents:

ef705e14

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-16 17:59:34)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-17 15:12:44)

Message:

Change type of uspace pointers in kernel from pointer type to numeric type

From kernel's perspective, userspace addresses are not valid pointers,
and can only be used in calls to copy_to/from_uspace().
Therefore, we change the type of those arguments and variables to
uspace_addr_t which is an alias for sysarg_t.

This allows the compiler to catch accidental direct accesses to
userspace addresses.

Additionally, to avoid losing the type information in code,
a macro uspace_ptr(type) is used that translates to uspace_addr_t.
I makes no functional difference, but allows keeping the type information
in code in case we implement some sort of static checking for it in the future.

File:

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

kernel/generic/src/syscall/copy.c

@@ -59 +59 @@
  * @return EOK on success or an error code from @ref errno.h.
  */
-errno_t copy_from_uspace(void *dst, const void *uspace_src, size_t size)
+errno_t copy_from_uspace(void *dst, uspace_addr_t uspace_src, size_t size)
 {
         ipl_t ipl;
@@ -68 +68 @@
 
         if (!KERNEL_ADDRESS_SPACE_SHADOWED) {
-                if (overlaps((uintptr_t) uspace_src, size,
+                if (overlaps(uspace_src, size,
                     KERNEL_ADDRESS_SPACE_START,
                     KERNEL_ADDRESS_SPACE_END - KERNEL_ADDRESS_SPACE_START)) {
@@ -82 +82 @@
          * Check whether the address is outside the address space hole.
          */
-        if (overlaps((uintptr_t) uspace_src, size, ADDRESS_SPACE_HOLE_START,
+        if (overlaps(uspace_src, size, ADDRESS_SPACE_HOLE_START,
             ADDRESS_SPACE_HOLE_END - ADDRESS_SPACE_HOLE_START))
                 return EPERM;
@@ -110 +110 @@
  * @return 0 on success or an error code from @ref errno.h.
  */
-errno_t copy_to_uspace(void *uspace_dst, const void *src, size_t size)
+errno_t copy_to_uspace(uspace_addr_t uspace_dst, const void *src, size_t size)
 {
         ipl_t ipl;
@@ -119 +119 @@
 
         if (!KERNEL_ADDRESS_SPACE_SHADOWED) {
-                if (overlaps((uintptr_t) uspace_dst, size,
+                if (overlaps(uspace_dst, size,
                     KERNEL_ADDRESS_SPACE_START,
                     KERNEL_ADDRESS_SPACE_END - KERNEL_ADDRESS_SPACE_START)) {
@@ -133 +133 @@
          * Check whether the address is outside the address space hole.
          */
-        if (overlaps((uintptr_t) uspace_dst, size, ADDRESS_SPACE_HOLE_START,
+        if (overlaps(uspace_dst, size, ADDRESS_SPACE_HOLE_START,
             ADDRESS_SPACE_HOLE_END - ADDRESS_SPACE_HOLE_START))
                 return EPERM;