Changeset 569a51a in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2017-12-08T21:17:27Z (7 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:

0016674

Parents:

071a1ddb

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-07 16:35:29)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:17:27)

Message:

Return phone handle in SYS_IPC_CONNECT_KBOX separately from error code.

File:

• kernel/generic/src/ipc/sysipc.c (modified) (2 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -901 +901 @@
 /** Syscall connect to a task by ID (32 bits)
  *
- * @return Phone id on success, or negative error code.
- *
- */
-sysarg_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid)
+ * @return Error code.
+ *
+ */
+sysarg_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid, cap_handle_t *uspace_phone)
 {
 #ifdef CONFIG_UDEBUG
         sysarg64_t taskid;
+        cap_handle_t phone;
         int rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(sysarg64_t));
-        if (rc != 0)
-                return (sysarg_t) rc;
-        
-        return ipc_connect_kbox((task_id_t) taskid);
+        if (rc == EOK) {
+                rc = ipc_connect_kbox((task_id_t) taskid, &phone);
+        }
+        if (rc == EOK) {
+                rc = copy_to_uspace(uspace_phone, &phone, sizeof(cap_handle_t));
+                // FIXME: Clean up phone on failure.
+        }
+        
+        return (sysarg_t) rc;
 #else
         return (sysarg_t) ENOTSUP;
@@ -924 +930 @@
 /** Syscall connect to a task by ID (64 bits)
  *
- * @return Phone id on success, or negative error code.
- *
- */
-sysarg_t sys_ipc_connect_kbox(sysarg_t taskid)
+ * @return Error code.
+ *
+ */
+sysarg_t sys_ipc_connect_kbox(sysarg_t taskid, cap_handle_t *uspace_phone)
 {
 #ifdef CONFIG_UDEBUG
-        return ipc_connect_kbox((task_id_t) taskid);
+        cap_handle_t phone;
+        int rc = ipc_connect_kbox((task_id_t) taskid, &phone);
+        if (rc == EOK) {
+                rc = copy_to_uspace(uspace_phone, &phone, sizeof(cap_handle_t));
+        }
+        return (sysarg_t) rc;
 #else
         return (sysarg_t) ENOTSUP;