Changeset 5a5269d in mainline for kernel/arch

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/arch

Files:

• abs32le/src/abs32le.c (modified) (1 diff)
• amd64/src/debug/stacktrace.c (modified) (1 diff)
• amd64/src/userspace.c (modified) (1 diff)
• arm32/src/debug/stacktrace.c (modified) (1 diff)
• arm32/src/userspace.c (modified) (2 diffs)
• arm64/src/arm64.c (modified) (1 diff)
• arm64/src/debug/stacktrace.c (modified) (1 diff)
• ia32/src/debug/stacktrace.c (modified) (1 diff)
• ia32/src/userspace.c (modified) (1 diff)
• ia64/src/ia64.c (modified) (1 diff)
• mips32/src/mips32.c (modified) (1 diff)
• ppc32/src/debug/stacktrace.c (modified) (1 diff)
• ppc32/src/ppc32.c (modified) (1 diff)
• riscv64/src/riscv64.c (modified) (1 diff)
• sparc64/src/sun4u/sparc64.c (modified) (1 diff)
• sparc64/src/sun4v/sparc64.c (modified) (1 diff)

kernel/arch/abs32le/src/abs32le.c

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

kernel/arch/amd64/src/debug/stacktrace.c

@@ -69 +69 @@
 bool uspace_frame_pointer_prev(stack_trace_context_t *ctx, uintptr_t *prev)
 {
-        return !copy_from_uspace((void *) prev,
-            (uint64_t *) ctx->fp + FRAME_OFFSET_FP_PREV, sizeof(*prev));
+        return !copy_from_uspace(prev,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_FP_PREV, sizeof(*prev));
 }
 
 bool uspace_return_address_get(stack_trace_context_t *ctx, uintptr_t *ra)
 {
-        return !copy_from_uspace((void *) ra,
-            (uint64_t *) ctx->fp + FRAME_OFFSET_RA, sizeof(*ra));
+        return !copy_from_uspace(ra,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_RA, sizeof(*ra));
 }
 

kernel/arch/amd64/src/userspace.c

@@ -66 +66 @@
             "iretq\n"
             :: [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-              [stack_top] "r" ((uint8_t *) kernel_uarg->uspace_stack +
+              [stack_top] "r" (kernel_uarg->uspace_stack +
               kernel_uarg->uspace_stack_size),
               [rflags] "r" (rflags),

kernel/arch/arm32/src/debug/stacktrace.c

@@ -68 +68 @@
 bool uspace_frame_pointer_prev(stack_trace_context_t *ctx, uintptr_t *prev)
 {
-        return !copy_from_uspace((void *) prev,
-            (uint32_t *) ctx->fp + FRAME_OFFSET_FP_PREV, sizeof(*prev));
+        return !copy_from_uspace(prev,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_FP_PREV, sizeof(*prev));
 }
 
 bool uspace_return_address_get(stack_trace_context_t *ctx, uintptr_t *ra)
 {
-        return !copy_from_uspace((void *) ra,
-            (uint32_t *) ctx->fp + FRAME_OFFSET_RA, sizeof(*ra));
+        return !copy_from_uspace(ra,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_RA, sizeof(*ra));
 }
 

kernel/arch/arm32/src/userspace.c

@@ -71 +71 @@
 
         /* set first parameter */
-        ustate.r0 = (uintptr_t) kernel_uarg->uspace_uarg;
+        ustate.r0 = kernel_uarg->uspace_uarg;
 
         /* %r1 is defined to hold pcb_ptr - set it to 0 */
@@ -93 +93 @@
 
         /* set user stack */
-        ustate.sp = ((uint32_t) kernel_uarg->uspace_stack) +
+        ustate.sp = kernel_uarg->uspace_stack +
             kernel_uarg->uspace_stack_size;
 
         /* set where uspace execution starts */
-        ustate.pc = (uintptr_t) kernel_uarg->uspace_entry;
+        ustate.pc = kernel_uarg->uspace_entry;
 
         /* status register in user mode */

kernel/arch/arm64/src/arm64.c

@@ -156 +156 @@
 
         /* Set program entry. */
-        ELR_EL1_write((uint64_t) kernel_uarg->uspace_entry);
+        ELR_EL1_write(kernel_uarg->uspace_entry);
 
         /* Set user stack. */
-        SP_EL0_write(((uint64_t) kernel_uarg->uspace_stack +
-            kernel_uarg->uspace_stack_size));
+        SP_EL0_write(kernel_uarg->uspace_stack +
+            kernel_uarg->uspace_stack_size);
 
         /* Clear Thread ID register. */

kernel/arch/arm64/src/debug/stacktrace.c

@@ -68 +68 @@
 bool uspace_frame_pointer_prev(stack_trace_context_t *ctx, uintptr_t *prev)
 {
-        return !copy_from_uspace((void *) prev,
-            (uint64_t *) ctx->fp + FRAME_OFFSET_FP_PREV, sizeof(*prev));
+        return !copy_from_uspace(prev,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_FP_PREV, sizeof(*prev));
 }
 
 bool uspace_return_address_get(stack_trace_context_t *ctx, uintptr_t *ra)
 {
-        return !copy_from_uspace((void *) ra,
-            (uint64_t *) ctx->fp + FRAME_OFFSET_RA, sizeof(*ra));
+        return !copy_from_uspace(ra,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_RA, sizeof(*ra));
 }
 

kernel/arch/ia32/src/debug/stacktrace.c

@@ -67 +67 @@
 bool uspace_frame_pointer_prev(stack_trace_context_t *ctx, uintptr_t *prev)
 {
-        return !copy_from_uspace((void *) prev,
-            (uint32_t *) ctx->fp + FRAME_OFFSET_FP_PREV, sizeof(*prev));
+        return !copy_from_uspace(prev,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_FP_PREV, sizeof(*prev));
 }
 
 bool uspace_return_address_get(stack_trace_context_t *ctx, uintptr_t *ra)
 {
-        return !copy_from_uspace((void *) ra,
-            (uint32_t *) ctx->fp + FRAME_OFFSET_RA, sizeof(*ra));
+        return !copy_from_uspace(ra,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_RA, sizeof(*ra));
 }
 

kernel/arch/ia32/src/userspace.c

@@ -70 +70 @@
             : [eflags_mask] "i" (~EFLAGS_NT),
               [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-              [stack_top] "r" ((uint8_t *) kernel_uarg->uspace_stack +
+              [stack_top] "r" (kernel_uarg->uspace_stack +
               kernel_uarg->uspace_stack_size),
               [eflags] "r" ((eflags & ~(EFLAGS_NT)) | EFLAGS_IF),

kernel/arch/ia64/src/ia64.c

@@ -244 +244 @@
          * uspace_stack_size / 2 bytes.
          */
-        switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) +
+        switch_to_userspace(kernel_uarg->uspace_entry,
+            kernel_uarg->uspace_stack +
             kernel_uarg->uspace_stack_size / 2 -
             ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
-            ((uintptr_t) kernel_uarg->uspace_stack) +
+            kernel_uarg->uspace_stack +
             kernel_uarg->uspace_stack_size / 2,
-            (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value);
+            kernel_uarg->uspace_uarg, psr.value, rsc.value);
 
         while (true)

kernel/arch/mips32/src/mips32.c

@@ -167 +167 @@
         cp0_status_write(cp0_status_read() | (cp0_status_exl_exception_bit |
             cp0_status_um_bit | cp0_status_ie_enabled_bit));
-        cp0_epc_write((uintptr_t) kernel_uarg->uspace_entry);
-        userspace_asm(((uintptr_t) kernel_uarg->uspace_stack +
-            kernel_uarg->uspace_stack_size),
-            (uintptr_t) kernel_uarg->uspace_uarg,
-            (uintptr_t) kernel_uarg->uspace_entry);
+        cp0_epc_write(kernel_uarg->uspace_entry);
+        userspace_asm(kernel_uarg->uspace_stack +
+            kernel_uarg->uspace_stack_size,
+            kernel_uarg->uspace_uarg,
+            kernel_uarg->uspace_entry);
 
         while (true)

kernel/arch/ppc32/src/debug/stacktrace.c

@@ -67 +67 @@
 bool uspace_frame_pointer_prev(stack_trace_context_t *ctx, uintptr_t *prev)
 {
-        return !copy_from_uspace((void *) prev,
-            (uint32_t *) ctx->fp + FRAME_OFFSET_FP_PREV, sizeof(*prev));
+        return !copy_from_uspace(prev,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_FP_PREV, sizeof(*prev));
 }
 
 bool uspace_return_address_get(stack_trace_context_t *ctx, uintptr_t *ra)
 {
-        return !copy_from_uspace((void *) ra,
-            (uint32_t *) ctx->fp + FRAME_OFFSET_RA, sizeof(*ra));
+        return !copy_from_uspace(ra,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_RA, sizeof(*ra));
 }
 

kernel/arch/ppc32/src/ppc32.c

@@ -292 +292 @@
 void userspace(uspace_arg_t *kernel_uarg)
 {
-        userspace_asm((uintptr_t) kernel_uarg->uspace_uarg,
-            (uintptr_t) kernel_uarg->uspace_stack +
+        userspace_asm(kernel_uarg->uspace_uarg,
+            kernel_uarg->uspace_stack +
             kernel_uarg->uspace_stack_size - SP_DELTA,
-            (uintptr_t) kernel_uarg->uspace_entry);
+            kernel_uarg->uspace_entry);
 
         unreachable();

kernel/arch/riscv64/src/riscv64.c

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

kernel/arch/sparc64/src/sun4u/sparc64.c

@@ -163 +163 @@
 {
         (void) interrupts_disable();
-        switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) +
+        switch_to_userspace(kernel_uarg->uspace_entry,
+            kernel_uarg->uspace_stack +
             kernel_uarg->uspace_stack_size -
             (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
-            (uintptr_t) kernel_uarg->uspace_uarg);
+            kernel_uarg->uspace_uarg);
 
         /* Not reached */

kernel/arch/sparc64/src/sun4v/sparc64.c

@@ -161 +161 @@
 {
         (void) interrupts_disable();
-        switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) +
+        switch_to_userspace(kernel_uarg->uspace_entry,
+            kernel_uarg->uspace_stack +
             kernel_uarg->uspace_stack_size -
             (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
-            (uintptr_t) kernel_uarg->uspace_uarg);
+            kernel_uarg->uspace_uarg);
 
         /* Not reached */