Changeset de1074b in mainline

Timestamp:

2018-03-13T18:01:47Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6c87f3a

Parents:

bde48fa

git-author:

Jakub Jermar <jakub@…> (2018-03-04 17:51:52)

git-committer:

Jakub Jermar <jakub@…> (2018-03-13 18:01:47)

Message:

Handle race condition in phone_connect

Do not panic if the phone is not in the expected state. This could mean
that the user hung up the original phone and created a new one under the
same capability handle.

File:

• kernel/generic/src/ipc/ipcrsc.c (modified) (1 diff)

kernel/generic/src/ipc/ipcrsc.c

@@ -219 +219 @@
                 return false;
 
-        assert(phone_obj->phone->state == IPC_PHONE_CONNECTING);
+        if (phone_obj->phone->state != IPC_PHONE_CONNECTING) {
+                /*
+                 * This looks like another phone. The one we were expecting
+                 * under this handle must be in the IPC_PHONE_CONNECTING state.
+                 */
+                kobject_put(phone_obj);
+                return false;
+        }
 
         /* Hand over phone_obj reference to the answerbox */