Changeset 5d3ed34 in mainline for kernel/generic/src/ipc/ops/concttome.c

Timestamp:

2012-09-03T21:39:37Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9c9bbaf

Parents:

9ef1b79b

Message:

Make sure that both dispatched and non-dispatched calls are properly
answered in ipc_cleanup_call_list().

• Define simple request_preprocess() hook for IPC_M_CONNECT_TO_ME to detect when the request_process() was not called and no resources allocated so that answer_cleanup() does not attempt to free non-existent resources.

File:

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

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

@@ -40 +40 @@
 #include <arch.h>
 
+static int request_preprocess(call_t *call, phone_t *phone)
+{
+        /* Start with the assumption that there is no allocated phoneid. */
+        IPC_SET_ARG5(call->data, -1);
+        return EOK;
+}
+
 static int request_process(call_t *call, answerbox_t *box)
 {
         int phoneid = phone_alloc(TASK);
 
-        if (phoneid < 0) {
-                IPC_SET_RETVAL(call->data, ELIMIT);
-                /*
-                 * This is a shortcut which bypasses the standard call
-                 * processing hooks. We are still playing it save here as
-                 * there is no state to be cleaned up at this stage.
-                 */
-                ipc_answer(box, call);
-                return -1;
-        }
-                
         IPC_SET_ARG5(call->data, phoneid);
         
@@ -64 +60 @@
         int phoneid = (int) IPC_GET_ARG5(*olddata);
 
-        phone_dealloc(phoneid);
+        if (phoneid >= 0)
+                phone_dealloc(phoneid);
 }
 
@@ -74 +71 @@
                 /* The connection was not accepted */
                 answer_cleanup(answer, olddata);
-        } else {
+        } 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]);
+        } else {
+                IPC_SET_RETVAL(answer->data, ELIMIT);
         }
 
@@ -86 +85 @@
 
 sysipc_ops_t ipc_m_connect_to_me_ops = {
-        .request_preprocess = null_request_preprocess,
+        .request_preprocess = request_preprocess,
         .request_forget = null_request_forget,
         .request_process = request_process,