Changeset 5a5269d in mainline for kernel/generic/src/ipc/ops

Timestamp:

2019-07-02T12:03:55Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

98c4c16

Parents:

aca97582

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-02 12:03:55)

git-committer:

GitHub <noreply@…> (2019-07-02 12:03:55)

Message:

Change type of uspace pointers in kernel from pointer type to numeric (#170)

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.

However, ccheck doesn't like that, so instead of using uspace_ptr(char),
we use uspace_ptr_char which is defined as
#define uspace_ptr_char uspace_ptr(char).

Location:

kernel/generic/src/ipc/ops

Files:

• dataread.c (modified) (3 diffs)
• datawrite.c (modified) (3 diffs)
• debug.c (modified) (1 diff)
• shareout.c (modified) (1 diff)

kernel/generic/src/ipc/ops/dataread.c

@@ -63 +63 @@
         if (!ipc_get_retval(&answer->data)) {
                 /* The recipient agreed to send data. */
-                uintptr_t src = ipc_get_arg1(&answer->data);
-                uintptr_t dst = ipc_get_arg1(olddata);
+                uspace_addr_t src = ipc_get_arg1(&answer->data);
+                uspace_addr_t dst = ipc_get_arg1(olddata);
                 size_t max_size = ipc_get_arg2(olddata);
                 size_t size = ipc_get_arg2(&answer->data);
@@ -81 +81 @@
                         }
                         errno_t rc = copy_from_uspace(answer->buffer,
-                            (void *) src, size);
+                            src, size);
                         if (rc) {
                                 ipc_set_retval(&answer->data, rc);
@@ -103 +103 @@
 {
         if (answer->buffer) {
-                uintptr_t dst = ipc_get_arg1(&answer->data);
+                uspace_addr_t dst = ipc_get_arg1(&answer->data);
                 size_t size = ipc_get_arg2(&answer->data);
                 errno_t rc;
 
-                rc = copy_to_uspace((void *) dst, answer->buffer, size);
+                rc = copy_to_uspace(dst, answer->buffer, size);
                 if (rc)
                         ipc_set_retval(&answer->data, rc);

kernel/generic/src/ipc/ops/datawrite.c

@@ -43 +43 @@
 static errno_t request_preprocess(call_t *call, phone_t *phone)
 {
-        uintptr_t src = ipc_get_arg1(&call->data);
+        uspace_addr_t src = ipc_get_arg1(&call->data);
         size_t size = ipc_get_arg2(&call->data);
 
@@ -59 +59 @@
         if (!call->buffer)
                 return ENOMEM;
-        errno_t rc = copy_from_uspace(call->buffer, (void *) src, size);
+        errno_t rc = copy_from_uspace(call->buffer, src, size);
         if (rc != EOK) {
                 /*
@@ -77 +77 @@
         if (!ipc_get_retval(&answer->data)) {
                 /* The recipient agreed to receive data. */
-                uintptr_t dst = (uintptr_t)ipc_get_arg1(&answer->data);
-                size_t size = (size_t)ipc_get_arg2(&answer->data);
-                size_t max_size = (size_t)ipc_get_arg2(olddata);
+                uspace_addr_t dst = ipc_get_arg1(&answer->data);
+                size_t size = ipc_get_arg2(&answer->data);
+                size_t max_size = ipc_get_arg2(olddata);
 
                 if (size <= max_size) {
-                        errno_t rc = copy_to_uspace((void *) dst,
+                        errno_t rc = copy_to_uspace(dst,
                             answer->buffer, size);
                         if (rc)

kernel/generic/src/ipc/ops/debug.c

@@ -47 +47 @@
 {
         if (answer->buffer) {
-                uintptr_t dst = ipc_get_arg1(&answer->data);
+                uspace_addr_t dst = ipc_get_arg1(&answer->data);
                 size_t size = ipc_get_arg2(&answer->data);
                 errno_t rc;
 
-                rc = copy_to_uspace((void *) dst, answer->buffer, size);
+                rc = copy_to_uspace(dst, answer->buffer, size);
                 if (rc)
                         ipc_set_retval(&answer->data, rc);

kernel/generic/src/ipc/ops/shareout.c

@@ -70 +70 @@
 
                 if (rc == EOK) {
-                        rc = copy_to_uspace((void *) ipc_get_arg2(&answer->data),
+                        rc = copy_to_uspace(ipc_get_arg2(&answer->data),
                             &dst_base, sizeof(dst_base));
                 }