Changeset fac0ac7 in mainline

Timestamp:

2018-05-15T18:48:49Z (7 years ago)

Author:

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

Branches:

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

Children:

7c3fb9b, 99013b84

Parents:

47e00b83

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-05-15 17:23:07)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-05-15 18:48:49)

Message:

Fix the return value of memcpy_to/from_uspace().

Location:

kernel

Files:

• arch/abs32le/src/abs32le.c (modified) (1 diff)
• arch/riscv64/src/riscv64.c (modified) (1 diff)
• generic/include/syscall/copy.h (modified) (1 diff)
• generic/src/syscall/copy.c (modified) (2 diffs)

kernel/arch/abs32le/src/abs32le.c

@@ -126 +126 @@
 }
 
-errno_t memcpy_from_uspace(void *dst, const void *uspace_src, size_t size)
+uintptr_t memcpy_from_uspace(void *dst, const void *uspace_src, size_t size)
 {
-        return EOK;
+        return 0;
 }
 
-errno_t memcpy_to_uspace(void *uspace_dst, const void *src, size_t size)
+uintptr_t memcpy_to_uspace(void *uspace_dst, const void *src, size_t size)
 {
-        return EOK;
+        return 0;
 }
 

kernel/arch/riscv64/src/riscv64.c

@@ -143 +143 @@
 }
 
-errno_t memcpy_from_uspace(void *dst, const void *uspace_src, size_t size)
+uintptr_t memcpy_from_uspace(void *dst, const void *uspace_src, size_t size)
 {
-        return EOK;
+        return 0;
 }
 
-errno_t memcpy_to_uspace(void *uspace_dst, const void *src, size_t size)
+uintptr_t memcpy_to_uspace(void *uspace_dst, const void *src, size_t size)
 {
-        return EOK;
+        return 0;
 }
 

kernel/generic/include/syscall/copy.h

@@ -49 +49 @@
 /*
  * This interface must be implemented by each architecture.
+ * The functions return zero on failure and nonzero on success.
  */
-extern errno_t memcpy_from_uspace(void *dst, const void *uspace_src, size_t size);
-extern errno_t memcpy_to_uspace(void *uspace_dst, const void *src, size_t size);
+extern uintptr_t memcpy_from_uspace(void *dst, const void *uspace_src, size_t size);
+extern uintptr_t memcpy_to_uspace(void *uspace_dst, const void *src, size_t size);
 
 #endif

kernel/generic/src/syscall/copy.c

@@ -90 +90 @@
         THREAD->in_copy_from_uspace = true;
 
-        rc = memcpy_from_uspace(dst, uspace_src, size);
+        rc = !memcpy_from_uspace(dst, uspace_src, size) ? EPERM : EOK;
 
         THREAD->in_copy_from_uspace = false;
 
         interrupts_restore(ipl);
-        return !rc ? EPERM : EOK;
+        return rc;
 }
 
@@ -141 +141 @@
         THREAD->in_copy_to_uspace = true;
 
-        rc = memcpy_to_uspace(uspace_dst, src, size);
+        rc = !memcpy_to_uspace(uspace_dst, src, size) ? EPERM : EOK;
 
         THREAD->in_copy_to_uspace = false;
 
         interrupts_restore(ipl);
-        return !rc ? EPERM : 0;
+        return rc;
 }