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

Timestamp:

2017-12-09T18:04:23Z (6 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:

0722869

Parents:

569a51a

Message:

Properly handle errors in SYS_IPC_KBOX.

Also, merge the separate 32/64-bit versions.
There is no reason to optimize such a function this way.

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