Changeset c33f39f in mainline for kernel/generic/src/ipc/ops

Timestamp:

2012-09-04T21:12:43Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

983cabe8

Parents:

2541646

Message:

Do not establish callback connections after the answerbox enters cleanup.

Location:

kernel/generic/src/ipc/ops

Files:

• conctmeto.c (modified) (1 diff)
• concttome.c (modified) (1 diff)
• connclone.c (modified) (1 diff)

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

@@ -65 +65 @@
         /* If the user accepted call, connect */
         if (IPC_GET_RETVAL(answer->data) == EOK)
-                ipc_phone_connect(phone, &TASK->answerbox);
+                (void) ipc_phone_connect(phone, &TASK->answerbox);
 
         return EOK;

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

@@ -73 +73 @@
         } else if (phoneid >= 0) {
                 /* The connection was accepted */
-                phone_connect(phoneid, &answer->sender->answerbox);
-                /* Set 'phone hash' as arg5 of response */
-                IPC_SET_ARG5(answer->data, (sysarg_t) &TASK->phones[phoneid]);
+                if (phone_connect(phoneid, &answer->sender->answerbox)) {
+                        /* Set 'phone hash' as arg5 of response */
+                        IPC_SET_ARG5(answer->data,
+                            (sysarg_t) &TASK->phones[phoneid]);
+                } else {
+                        /* The answerbox is shutting down. */
+                        IPC_SET_RETVAL(answer->data, ENOENT);
+                        answer_cleanup(answer, olddata);
+                }
         } else {
                 IPC_SET_RETVAL(answer->data, ELIMIT);

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

@@ -87 +87 @@
         }
                 
-        ipc_phone_connect(&phone->callee->task->phones[newphid],
+        (void) ipc_phone_connect(&phone->callee->task->phones[newphid],
             cloned_phone->callee);
         phones_unlock(cloned_phone, phone);