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

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

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;