Changeset fa603e99 in mainline

Timestamp:

2019-07-08T12:20:34Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a949f4a

Parents:

b781cc49

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-08 12:19:14)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-08 12:20:34)

Message:

Fix unhandled error condition in udebug_name_read

Detected by GCC when LTO is enabled.
Also changed a bunch of literal zeros in the file to EOK.

Location:

kernel/generic/src/udebug

Files:

• udebug_ipc.c (modified) (9 diffs)
• udebug_ops.c (modified) (1 diff)

kernel/generic/src/udebug/udebug_ipc.c

@@ -59 +59 @@
         }
 
-        return 0;
+        return EOK;
 }
 
@@ -191 +191 @@
          */
 
-        ipc_set_retval(&call->data, 0);
+        ipc_set_retval(&call->data, EOK);
         /*
          * ARG1=dest, ARG2=size as in IPC_M_DATA_READ so that
@@ -218 +218 @@
         size_t buf_size;
         void *data;
+        errno_t rc;
 
         uspace_addr = ipc_get_arg2(&call->data);        /* Destination address */
@@ -225 +226 @@
          * Read task name.
          */
-        udebug_name_read((char **) &data, &data_size);
+        rc = udebug_name_read((char **) &data, &data_size);
+        if (rc != EOK) {
+                ipc_set_retval(&call->data, rc);
+                ipc_answer(&TASK->kb.box, call);
+                return;
+        }
 
         /* Copy MAX(buf_size, data_size) bytes */
@@ -238 +244 @@
          */
 
-        ipc_set_retval(&call->data, 0);
+        ipc_set_retval(&call->data, EOK);
         /*
          * ARG1=dest, ARG2=size as in IPC_M_DATA_READ so that
@@ -292 +298 @@
          */
 
-        ipc_set_retval(&call->data, 0);
+        ipc_set_retval(&call->data, EOK);
         /*
          * ARG1=dest, ARG2=size as in IPC_M_DATA_READ so that
@@ -334 +340 @@
         uspace_addr = ipc_get_arg3(&call->data);
 
-        ipc_set_retval(&call->data, 0);
+        ipc_set_retval(&call->data, EOK);
         /*
          * ARG1=dest, ARG2=size as in IPC_M_DATA_READ so that
@@ -377 +383 @@
         to_copy = sizeof(istate_t);
 
-        ipc_set_retval(&call->data, 0);
+        ipc_set_retval(&call->data, EOK);
         /*
          * ARG1=dest, ARG2=size as in IPC_M_DATA_READ so that
@@ -417 +423 @@
         assert(buffer != NULL);
 
-        ipc_set_retval(&call->data, 0);
+        ipc_set_retval(&call->data, EOK);
         /*
          * ARG1=dest, ARG2=size as in IPC_M_DATA_READ so that

kernel/generic/src/udebug/udebug_ops.c

@@ -427 +427 @@
  * @param data_size Place to store size of the data.
  *
- * @return EOK.
+ * @return EOK on success, ENOMEM if memory allocation failed.
  *
  */