Changeset eab9689 in mainline

Timestamp:

2015-06-03T15:36:08Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

022d72ff

Parents:

53031c2

Message:

Fix assertion on phone→state == IPC_PHONE_CONNECTING in phone_dealloc()

When handling IPC_M_CONNECT_ME_TO, remember the return value from
phone_alloc() in order to be later able to tell whether a phone was
indeed allocated or not.

File:

• kernel/generic/src/ipc/ops/conctmeto.c (modified) (3 diffs)

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

@@ -44 +44 @@
         int newphid = phone_alloc(TASK);
 
+        /* Remember the phoneid or the error. */
+        call->priv = newphid;
         if (newphid < 0)
                 return ELIMIT;
@@ -49 +51 @@
         /* Set arg5 for server */
         IPC_SET_ARG5(call->data, (sysarg_t) &TASK->phones[newphid]);
-        call->priv = newphid;
 
         return EOK;
@@ -73 +74 @@
 static int answer_process(call_t *answer)
 {
-        if (IPC_GET_RETVAL(answer->data))
+        if (IPC_GET_RETVAL(answer->data) && ((int) answer->priv >= 0)) {
+                /*
+                 * Something went wrong and there is a phone that needs to be
+                 * deallocated.
+                 */
                 phone_dealloc(answer->priv);
-        else
+        } else {
                 IPC_SET_ARG5(answer->data, answer->priv);
+        }
         
         return EOK;