Changeset e39d7b8 in mainline for kernel/generic/src/sysinfo/sysinfo.c

Timestamp:

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

File:

• kernel/generic/src/sysinfo/sysinfo.c (modified) (8 diffs)

kernel/generic/src/sysinfo/sysinfo.c

@@ -677 +677 @@
  *
  */
-_NO_TRACE static sysinfo_return_t sysinfo_get_item_uspace(void *ptr, size_t size,
+_NO_TRACE static sysinfo_return_t sysinfo_get_item_uspace(uspace_ptr(void) ptr, size_t size,
     bool dry_run)
 {
@@ -786 +786 @@
  *
  */
-_NO_TRACE static sysinfo_return_t sysinfo_get_keys_uspace(void *ptr, size_t size,
+_NO_TRACE static sysinfo_return_t sysinfo_get_keys_uspace(uspace_ptr(void) ptr, size_t size,
     bool dry_run)
 {
@@ -831 +831 @@
  *
  */
-sys_errno_t sys_sysinfo_get_keys_size(void *path_ptr, size_t path_size,
-    void *size_ptr)
+sys_errno_t sys_sysinfo_get_keys_size(uspace_ptr(void) path_ptr, size_t path_size,
+    uspace_ptr(void) size_ptr)
 {
         errno_t rc;
@@ -879 +879 @@
  *
  */
-sys_errno_t sys_sysinfo_get_keys(void *path_ptr, size_t path_size,
-    void *buffer_ptr, size_t buffer_size, size_t *size_ptr)
+sys_errno_t sys_sysinfo_get_keys(uspace_ptr(void) path_ptr, size_t path_size,
+    uspace_ptr(void) buffer_ptr, size_t buffer_size, uspace_ptr(size_t) size_ptr)
 {
         errno_t rc;
@@ -914 +914 @@
  *
  */
-sysarg_t sys_sysinfo_get_val_type(void *path_ptr, size_t path_size)
+sysarg_t sys_sysinfo_get_val_type(uspace_ptr(void) path_ptr, size_t path_size)
 {
         /*
@@ -950 +950 @@
  *
  */
-sys_errno_t sys_sysinfo_get_value(void *path_ptr, size_t path_size,
-    void *value_ptr)
+sys_errno_t sys_sysinfo_get_value(uspace_ptr(void) path_ptr, size_t path_size,
+    uspace_ptr(void) value_ptr)
 {
         errno_t rc;
@@ -986 +986 @@
  *
  */
-sys_errno_t sys_sysinfo_get_data_size(void *path_ptr, size_t path_size,
-    void *size_ptr)
+sys_errno_t sys_sysinfo_get_data_size(uspace_ptr(void) path_ptr, size_t path_size,
+    uspace_ptr(void) size_ptr)
 {
         errno_t rc;
@@ -1036 +1036 @@
  *
  */
-sys_errno_t sys_sysinfo_get_data(void *path_ptr, size_t path_size,
-    void *buffer_ptr, size_t buffer_size, size_t *size_ptr)
+sys_errno_t sys_sysinfo_get_data(uspace_ptr(void) path_ptr, size_t path_size,
+    uspace_ptr(void) buffer_ptr, size_t buffer_size, uspace_ptr(size_t) size_ptr)
 {
         errno_t rc;