Changeset 5a5269d in mainline for kernel/generic/src/ddi/ddi.c

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).

File:

• kernel/generic/src/ddi/ddi.c (modified) (9 diffs)

kernel/generic/src/ddi/ddi.c

@@ -248 +248 @@
  */
 sys_errno_t sys_physmem_map(uintptr_t phys, size_t pages, unsigned int flags,
-    void *virt_ptr, uintptr_t bound)
+    uspace_ptr_uintptr_t virt_ptr, uintptr_t bound)
 {
         uintptr_t virt;
@@ -262 +262 @@
         rc = copy_to_uspace(virt_ptr, &virt, sizeof(virt));
         if (rc != EOK) {
-                physmem_unmap((uintptr_t) virt);
+                physmem_unmap(virt);
                 return rc;
         }
@@ -393 +393 @@
  *
  */
-sys_errno_t sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
+sys_errno_t sys_iospace_enable(uspace_ptr_ddi_ioarg_t uspace_io_arg)
 {
         ddi_ioarg_t arg;
@@ -404 +404 @@
 }
 
-sys_errno_t sys_iospace_disable(ddi_ioarg_t *uspace_io_arg)
+sys_errno_t sys_iospace_disable(uspace_ptr_ddi_ioarg_t uspace_io_arg)
 {
         ddi_ioarg_t arg;
@@ -465 +465 @@
 
 sys_errno_t sys_dmamem_map(size_t size, unsigned int map_flags, unsigned int flags,
-    void *phys_ptr, void *virt_ptr, uintptr_t bound)
+    uspace_ptr_uintptr_t phys_ptr, uspace_ptr_uintptr_t virt_ptr, uintptr_t bound)
 {
         if ((flags & DMAMEM_FLAGS_ANONYMOUS) == 0) {
@@ -473 +473 @@
 
                 uintptr_t phys;
-                errno_t rc = dmamem_map((uintptr_t) virt_ptr, size, map_flags,
+                errno_t rc = dmamem_map(virt_ptr, size, map_flags,
                     flags, &phys);
 
@@ -481 +481 @@
                 rc = copy_to_uspace(phys_ptr, &phys, sizeof(phys));
                 if (rc != EOK) {
-                        dmamem_unmap((uintptr_t) virt_ptr, size);
+                        dmamem_unmap(virt_ptr, size);
                         return rc;
                 }
@@ -508 +508 @@
                 rc = copy_to_uspace(phys_ptr, &phys, sizeof(phys));
                 if (rc != EOK) {
-                        dmamem_unmap_anonymous((uintptr_t) virt);
+                        dmamem_unmap_anonymous(virt);
                         return rc;
                 }
@@ -514 +514 @@
                 rc = copy_to_uspace(virt_ptr, &virt, sizeof(virt));
                 if (rc != EOK) {
-                        dmamem_unmap_anonymous((uintptr_t) virt);
+                        dmamem_unmap_anonymous(virt);
                         return rc;
                 }