Changeset 8fb674b in mainline

Timestamp:

2020-12-31T21:27:13Z (3 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Parents:

6a208fc

git-author:

Matthieu Riolo <matthieu.riolo@…> (2020-06-27 19:08:36)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2020-12-31 21:27:13)

Message:

correcting usage of async_data_read_receive() in srv/input

Location:

uspace

Files:

• lib/c/generic/io/input.c (modified) (1 diff)
• lib/c/include/ipc/input.h (modified) (1 diff)
• srv/hid/input/input.c (modified) (2 diffs)

uspace/lib/c/generic/io/input.c

@@ -213 +213 @@
 errno_t input_layout_get(async_sess_t *sess, char **layout)
 {
-        errno_t rc;
-        ipc_call_t call;
+        *layout = NULL;
+
         async_exch_t *exch = async_exchange_begin(sess);
-        aid_t mid = async_send_0(exch, INPUT_GET_LAYOUT, &call);
-        async_wait_for(mid, &rc);
-
-        if (rc != EOK) {
-                goto error;
+
+        ipc_call_t answer;
+        aid_t req = async_send_0(exch, INPUT_GET_LAYOUT, &answer);
+
+        char layout_buf[INPUT_LAYOUT_NAME_MAXLEN + 1];
+        ipc_call_t dreply;
+        aid_t dreq = async_data_read(exch, layout_buf, INPUT_LAYOUT_NAME_MAXLEN,
+            &dreply);
+
+        errno_t dretval;
+        async_wait_for(dreq, &dretval);
+
+        async_exchange_end(exch);
+
+        if (dretval != EOK) {
+                async_forget(req);
+                return dretval;
         }
 
-        size_t length = ipc_get_arg1(&call);
-
-        *layout = malloc(length * sizeof(char *));
-        if (layout == NULL) {
-                rc = ENOMEM;
-                free(*layout);
-                goto error;
-        }
-
-        rc = async_data_read_start(exch, *layout, length);
-
-        if (rc != EOK)
-                free(*layout);
-
-error:
-        async_exchange_end(exch);
-        return rc;
+        errno_t retval;
+        async_wait_for(req, &retval);
+
+        if (retval != EOK)
+                return retval;
+
+        size_t length = ipc_get_arg2(&dreply);
+        assert(length <= INPUT_LAYOUT_NAME_MAXLEN);
+        layout_buf[length] = '\0';
+
+        *layout = str_dup(layout_buf);
+        if (*layout == NULL)
+                return ENOMEM;
+
+        return EOK;
 }
 

uspace/lib/c/include/ipc/input.h

@@ -38 +38 @@
 #include <ipc/common.h>
 
+static size_t const INPUT_LAYOUT_NAME_MAXLEN = 255;
+
 typedef enum {
         INPUT_ACTIVATE = IPC_FIRST_USER_METHOD,

uspace/srv/hid/input/input.c

@@ -50 +50 @@
 #include <ipc/input.h>
 #include <loc.h>
+#include <macros.h>
 #include <ns.h>
 #include <stdbool.h>
@@ -157 +158 @@
         const char *layout_name = layout_active->name;
         size_t length = str_size(layout_name) + 1;
-        ipc_call_t id;
-
-        async_answer_1(call, EOK, length);
-        if (async_data_read_receive(&id, NULL)) {
-                async_data_read_finalize(&id, layout_name, length);
-        }
+        ipc_call_t rec_call;
+
+        size_t max_size;
+        if (!async_data_read_receive(&rec_call, &max_size)) {
+                async_answer_0(&rec_call, EREFUSED);
+                async_answer_0(call, EREFUSED);
+                return;
+        }
+
+        errno_t rc = async_data_read_finalize(&rec_call, layout_name,
+            min(length, max_size));
+        async_answer_0(call, rc);
 }