Changes in kernel/generic/src/sysinfo/sysinfo.c [311bc25:7a0359b] in mainline

File:

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

kernel/generic/src/sysinfo/sysinfo.c

@@ -40 +40 @@
 #include <arch/asm.h>
 #include <errno.h>
-#include <macros.h>
 
 /** Maximal sysinfo path length */
@@ -297 +296 @@
  */
 void sysinfo_set_item_val(const char *name, sysinfo_item_t **root,
-    sysarg_t val)
+    unative_t val)
 {
         /* Protect sysinfo tree consistency */
@@ -482 +481 @@
                 sysinfo_indent(depth);
                 
-                sysarg_t val;
+                unative_t val;
                 size_t size;
                 
@@ -495 +494 @@
                         break;
                 case SYSINFO_VAL_DATA:
-                        printf("+ %s (%zu bytes)\n", cur->name,
+                        printf("+ %s (%" PRIs" bytes)\n", cur->name,
                             cur->val.data.size);
                         break;
@@ -506 +505 @@
                         /* N.B.: No data was actually returned (only a dry run) */
                         (void) cur->val.fn_data(cur, &size, true);
-                        printf("+ %s (%zu bytes) [generated]\n", cur->name,
+                        printf("+ %s (%" PRIs" bytes) [generated]\n", cur->name,
                             size);
                         break;
@@ -661 +660 @@
  *
  */
-sysarg_t sys_sysinfo_get_tag(void *path_ptr, size_t path_size)
+unative_t sys_sysinfo_get_tag(void *path_ptr, size_t path_size)
 {
         /*
@@ -680 +679 @@
                 ret.tag = SYSINFO_VAL_DATA;
         
-        return (sysarg_t) ret.tag;
+        return (unative_t) ret.tag;
 }
 
@@ -697 +696 @@
  *
  */
-sysarg_t sys_sysinfo_get_value(void *path_ptr, size_t path_size,
+unative_t sys_sysinfo_get_value(void *path_ptr, size_t path_size,
     void *value_ptr)
 {
@@ -716 +715 @@
                 rc = EINVAL;
         
-        return (sysarg_t) rc;
+        return (unative_t) rc;
 }
 
@@ -733 +732 @@
  *
  */
-sysarg_t sys_sysinfo_get_data_size(void *path_ptr, size_t path_size,
+unative_t sys_sysinfo_get_data_size(void *path_ptr, size_t path_size,
     void *size_ptr)
 {
@@ -753 +752 @@
                 rc = EINVAL;
         
-        return (sysarg_t) rc;
+        return (unative_t) rc;
 }
 
@@ -762 +761 @@
  * character must be null).
  *
- * If the user space buffer size does not equal
- * the actual size of the returned data, the data
- * is truncated. Whether this is actually a fatal
- * error or the data can be still interpreted as valid
- * depends on the nature of the data and has to be
- * decided by the user space.
- *
- * The actual size of data returned is stored to
- * size_ptr.
+ * The user space buffer must be sized exactly according
+ * to the size of the binary data, otherwise the request
+ * fails.
  *
  * @param path_ptr    Sysinfo path in the user address space.
@@ -777 +770 @@
  *                    to store the binary data.
  * @param buffer_size User space buffer size.
- * @param size_ptr    User space pointer where to store the
- *                    binary data size.
  *
  * @return Error code (EOK in case of no error).
  *
  */
-sysarg_t sys_sysinfo_get_data(void *path_ptr, size_t path_size,
-    void *buffer_ptr, size_t buffer_size, size_t *size_ptr)
+unative_t sys_sysinfo_get_data(void *path_ptr, size_t path_size,
+    void *buffer_ptr, size_t buffer_size)
 {
         int rc;
         
         /* Get the item */
-        sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size,
-            false);
-        
+        sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size, false);
+
         /* Only constant or generated binary data is considered */
-        if ((ret.tag == SYSINFO_VAL_DATA) ||
-            (ret.tag == SYSINFO_VAL_FUNCTION_DATA)) {
-                size_t size = min(ret.data.size, buffer_size);
-                rc = copy_to_uspace(buffer_ptr, ret.data.data, size);
-                if (rc == EOK)
-                        rc = copy_to_uspace(size_ptr, &size, sizeof(size));
+        if ((ret.tag == SYSINFO_VAL_DATA) || (ret.tag == SYSINFO_VAL_FUNCTION_DATA)) {
+                /* Check destination buffer size */
+                if (ret.data.size == buffer_size)
+                        rc = copy_to_uspace(buffer_ptr, ret.data.data,
+                            ret.data.size);
+                else
+                        rc = ENOMEM;
         } else
                 rc = EINVAL;
@@ -806 +797 @@
                 free(ret.data.data);
         
-        return (sysarg_t) rc;
+        return (unative_t) rc;
 }