Changeset e39d7b8 in mainline for kernel/generic/src/proc

Timestamp:

2019-06-17T15:12:44Z (7 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.

Location:

kernel/generic/src/proc

Files:

• program.c (modified) (4 diffs)
• task.c (modified) (3 diffs)
• thread.c (modified) (3 diffs)

kernel/generic/src/proc/program.c

@@ -69 +69 @@
  *
  */
-errno_t program_create(as_t *as, uintptr_t entry_addr, char *name, program_t *prg)
+errno_t program_create(as_t *as, uspace_addr_t entry_addr, char *name, program_t *prg)
 {
         uspace_arg_t *kernel_uarg = (uspace_arg_t *)
@@ -86 +86 @@
          * Create the stack address space area.
          */
-        uintptr_t virt = (uintptr_t) -1;
+        uintptr_t virt = (uintptr_t) AS_AREA_ANY;
         uintptr_t bound = USER_ADDRESS_SPACE_END - (STACK_SIZE_USER - 1);
 
@@ -103 +103 @@
         }
 
-        kernel_uarg->uspace_entry = (void *) entry_addr;
-        kernel_uarg->uspace_stack = (void *) virt;
+        kernel_uarg->uspace_entry = entry_addr;
+        kernel_uarg->uspace_stack = virt;
         kernel_uarg->uspace_stack_size = STACK_SIZE_USER;
-        kernel_uarg->uspace_thread_function = NULL;
-        kernel_uarg->uspace_thread_arg = NULL;
-        kernel_uarg->uspace_uarg = NULL;
+        kernel_uarg->uspace_thread_function = USPACE_NULL;
+        kernel_uarg->uspace_thread_arg = USPACE_NULL;
+        kernel_uarg->uspace_uarg = USPACE_NULL;
 
         /*
@@ -218 +218 @@
  *
  */
-sys_errno_t sys_program_spawn_loader(char *uspace_name, size_t name_len)
+sys_errno_t sys_program_spawn_loader(uspace_ptr(char) uspace_name, size_t name_len)
 {
         /* Cap length of name and copy it from userspace. */

kernel/generic/src/proc/task.c

@@ -323 +323 @@
  *
  */
-sys_errno_t sys_task_get_id(sysarg64_t *uspace_taskid)
+sys_errno_t sys_task_get_id(uspace_ptr(sysarg64_t) uspace_taskid)
 {
         /*
@@ -363 +363 @@
  *
  */
-sys_errno_t sys_task_set_name(const char *uspace_name, size_t name_len)
+sys_errno_t sys_task_set_name(const uspace_ptr(char) uspace_name, size_t name_len)
 {
         char namebuf[TASK_NAME_BUFLEN];
@@ -404 +404 @@
  *
  */
-sys_errno_t sys_task_kill(task_id_t *uspace_taskid)
+sys_errno_t sys_task_kill(uspace_ptr(task_id_t) uspace_taskid)
 {
         task_id_t taskid;

kernel/generic/src/proc/thread.c

@@ -998 +998 @@
  *
  */
-sys_errno_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name,
-    size_t name_len, thread_id_t *uspace_thread_id)
+sys_errno_t sys_thread_create(uspace_ptr(uspace_arg_t) uspace_uarg, uspace_ptr(char) uspace_name,
+    size_t name_len, uspace_ptr(thread_id_t) uspace_thread_id)
 {
         if (name_len > THREAD_NAME_BUFLEN - 1)
@@ -1029 +1029 @@
             THREAD_FLAG_USPACE | THREAD_FLAG_NOATTACH, namebuf);
         if (thread) {
-                if (uspace_thread_id != NULL) {
+                if (uspace_thread_id) {
                         rc = copy_to_uspace(uspace_thread_id, &thread->tid,
                             sizeof(thread->tid));
@@ -1088 +1088 @@
  *
  */
-sys_errno_t sys_thread_get_id(thread_id_t *uspace_thread_id)
+sys_errno_t sys_thread_get_id(uspace_ptr(thread_id_t) uspace_thread_id)
 {
         /*