Changeset af6bd113 in mainline

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Children:

03d5697

Parents:

bbf38ad

git-author:

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

git-committer:

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

Message:

Hang up phones connected during ipc_cleanup()

If an answer to IPC_M_CONNECT_ME_TO arrives during ipc_cleanup(),
new phone capabilities may be published. We need to hang up these new
phones too.

File:

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

kernel/generic/src/ipc/ipc.c

@@ -753 +753 @@
 }
 
-/** Wait for all answers to asynchronous calls to arrive. */
-static void ipc_wait_for_all_answered_calls(void)
-{
-        while (atomic_get(&TASK->answerbox.active_calls) != 0) {
-                call_t *call = ipc_wait_for_call(&TASK->answerbox,
-                    SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE);
-                assert(call->flags & (IPC_CALL_ANSWERED | IPC_CALL_NOTIF));
-
-                SYSIPC_OP(answer_process, call);
-
-                kobject_put(call->kobject);
-        }
-}
-
 static bool phone_cap_cleanup_cb(cap_t *cap, void *arg)
 {
@@ -775 +761 @@
         cap_free(cap->task, cap->handle);
         return true;
+}
+
+/** Wait for all answers to asynchronous calls to arrive. */
+static void ipc_wait_for_all_answered_calls(void)
+{
+        while (atomic_get(&TASK->answerbox.active_calls) != 0) {
+                call_t *call = ipc_wait_for_call(&TASK->answerbox,
+                    SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE);
+                assert(call->flags & (IPC_CALL_ANSWERED | IPC_CALL_NOTIF));
+
+                SYSIPC_OP(answer_process, call);
+
+                kobject_put(call->kobject);
+
+                /*
+                 * Now there may be some new phones and new hangup calls to
+                 * immediately forget.
+                 */
+                caps_apply_to_kobject_type(TASK, KOBJECT_TYPE_PHONE,
+                    phone_cap_cleanup_cb, NULL);
+                ipc_forget_all_active_calls();
+        }
 }
 
@@ -814 +822 @@
         irq_spinlock_unlock(&TASK->answerbox.lock, true);
 
-        /* Disconnect all our phones ('ipc_phone_hangup') */
+        /* Hangup all phones and destroy all phone capabilities */
         caps_apply_to_kobject_type(TASK, KOBJECT_TYPE_PHONE,
             phone_cap_cleanup_cb, NULL);
 
-        /* Unsubscribe from any event notifications. */
+        /* Unsubscribe from any event notifications */
         event_cleanup_answerbox(&TASK->answerbox);
 
@@ -844 +852 @@
         ipc_forget_all_active_calls();
         ipc_wait_for_all_answered_calls();
+
+        assert(atomic_get(&TASK->answerbox.active_calls) == 0);
 }