Changeset bbf38ad in mainline

Timestamp:

2018-03-11T07:35:05Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Children:

af6bd113

Parents:

26a6ed4

git-author:

Jakub Jermar <jakub@…> (2018-03-10 19:59:41)

git-committer:

Jakub Jermar <jakub@…> (2018-03-11 07:35:05)

Message:

Publish capability only after phone connects

In IPC_M_CONNECT_TO_ME it is desirable to publish the new phone
capability only after the phone gets connected. Otherwise we might have
open phones without capabilities and no way to hang them up in
ipc_cleanup().

Location:

kernel/generic

Files:

• include/ipc/ipcrsc.h (modified) (1 diff)
• src/ipc/ipcrsc.c (modified) (1 diff)
• src/ipc/ops/concttome.c (modified) (4 diffs)

kernel/generic/include/ipc/ipcrsc.h

@@ -41 +41 @@
 
 extern errno_t phone_alloc(task_t *, bool, cap_handle_t *, kobject_t **);
-extern bool phone_connect(cap_handle_t, answerbox_t *);
 extern void phone_dealloc(cap_handle_t);
 

kernel/generic/src/ipc/ipcrsc.c

@@ -209 +209 @@
 }
 
-/** Connect phone to a given answerbox.
- *
- * @param handle  Capability handle of the phone to be connected.
- * @param box     Answerbox to which to connect the phone.
- * @return        True if the phone was connected, false otherwise.
- */
-bool phone_connect(cap_handle_t handle, answerbox_t *box)
-{
-        kobject_t *phone_obj = kobject_get(TASK, handle, KOBJECT_TYPE_PHONE);
-        if (!phone_obj)
-                return false;
-
-        /* Hand over phone_obj reference to the answerbox */
-        return ipc_phone_connect(phone_obj->phone, box);
-}
-
 /** @}
  */

kernel/generic/src/ipc/ops/concttome.c

@@ -43 +43 @@
 {
         cap_handle_t phone_handle;
-        errno_t rc = phone_alloc(TASK, true, &phone_handle, NULL);
+        kobject_t *phone_obj;
+        errno_t rc = phone_alloc(TASK, false, &phone_handle, &phone_obj);
+        call->priv = (sysarg_t) phone_obj;
         IPC_SET_ARG5(call->data, (rc == EOK) ? phone_handle : -1);
         return 0;
@@ -51 +53 @@
 {
         cap_handle_t phone_handle = (cap_handle_t) IPC_GET_ARG5(*olddata);
+        kobject_t *phone_obj = (kobject_t *) answer->priv;
 
-        if (phone_handle >= 0)
-                phone_dealloc(phone_handle);
+        if (phone_handle >= 0) {
+                kobject_put(phone_obj);
+                cap_free(TASK, phone_handle);
+        }
 
         return EOK;
@@ -61 +66 @@
 {
         cap_handle_t phone_handle = (cap_handle_t) IPC_GET_ARG5(*olddata);
+        kobject_t *phone_obj = (kobject_t *) answer->priv;
 
         if (IPC_GET_RETVAL(answer->data) != EOK) {
@@ -66 +72 @@
                 answer_cleanup(answer, olddata);
         } else if (phone_handle >= 0) {
-                /* The connection was accepted */
-                if (phone_connect(phone_handle, &answer->sender->answerbox)) {
+                /*
+                 * The connection was accepted
+                 * */
+
+                /*
+                 * We need to create another reference as the one we have now
+                 * will be consumed by ipc_phone_connect().
+                 */
+                kobject_add_ref(phone_obj);
+
+                if (ipc_phone_connect(phone_obj->phone,
+                    &answer->sender->answerbox)) {
+                        /* Pass the reference to the capability */
+                        cap_publish(TASK, phone_handle, phone_obj);
                         /* Set 'phone hash' as ARG5 of response */
-                        kobject_t *phone_obj = kobject_get(TASK, phone_handle,
-                            KOBJECT_TYPE_PHONE);
                         IPC_SET_ARG5(answer->data,
                             (sysarg_t) phone_obj->phone);
-                        kobject_put(phone_obj);
                 } else {
                         /* The answerbox is shutting down. */