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

Timestamp:

2017-12-09T18:21:29Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

bd253241

Parents:

071a1ddb (diff), 0016674 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-09 18:21:29)

git-committer:

GitHub <noreply@…> (2017-12-09 18:21:29)

Message:

Merge SYS_IPC_CONNECT_KBOX changes.

Return phone handle in SYS_IPC_CONNECT_KBOX separately from error code, don't leak phone on failure, and remove the unnecessary separation into two versions.

File:

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

kernel/generic/src/ipc/sysipc.c

@@ -897 +897 @@
 }
 
-#ifdef __32_BITS__
-
-/** 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)
+/** Syscall connect to a task by ID
+ *
+ * @return Error code.
+ *
+ */
+sysarg_t sys_ipc_connect_kbox(task_id_t *uspace_taskid, cap_handle_t *uspace_phone)
 {
 #ifdef CONFIG_UDEBUG
-        sysarg64_t taskid;
-        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);
+        task_id_t taskid;
+        cap_handle_t phone;
+        
+        int rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(task_id_t));
+        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));
+                if (rc != EOK) {
+                        // Clean up the phone on failure.
+                        sys_ipc_hangup(phone);
+                }
+        }
+        
+        return (sysarg_t) rc;
 #else
         return (sysarg_t) ENOTSUP;
@@ -918 +927 @@
 }
 
-#endif  /* __32_BITS__ */
-
-#ifdef __64_BITS__
-
-/** 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)
-{
-#ifdef CONFIG_UDEBUG
-        return ipc_connect_kbox((task_id_t) taskid);
-#else
-        return (sysarg_t) ENOTSUP;
-#endif
-}
-
-#endif  /* __64_BITS__ */
-
 /** @}
  */