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

Timestamp:

2012-09-03T21:39:37Z (13 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/ipc.c (modified) (4 diffs)

kernel/generic/src/ipc/ipc.c

@@ -46 +46 @@
 #include <ipc/event.h>
 #include <ipc/sysipc_ops.h>
+#include <ipc/sysipc_priv.h>
 #include <errno.h>
 #include <mm/slab.h>
@@ -475 +476 @@
 /** Answer all calls from list with EHANGUP answer.
  *
+ * @param box Answerbox with the list.
  * @param lst Head of the list to be cleaned up.
- *
- */
-void ipc_cleanup_call_list(list_t *lst)
-{
+ */
+void ipc_cleanup_call_list(answerbox_t *box, list_t *lst)
+{
+        irq_spinlock_lock(&box->lock, true);
         while (!list_empty(lst)) {
                 call_t *call = list_get_instance(list_first(lst), call_t,
@@ -485 +487 @@
                 
                 list_remove(&call->ab_link);
-                
+
+                irq_spinlock_unlock(&box->lock, true);
+
+                ipc_data_t old = call->data;
                 IPC_SET_RETVAL(call->data, EHANGUP);
+                answer_preprocess(call, &old);
                 _ipc_answer_free_call(call, true);
-        }
+
+                irq_spinlock_lock(&box->lock, true);
+        }
+        irq_spinlock_unlock(&box->lock, true);
 }
 
@@ -694 +703 @@
         
         /* Answer all messages in 'calls' and 'dispatched_calls' queues */
-        irq_spinlock_lock(&TASK->answerbox.lock, true);
-        ipc_cleanup_call_list(&TASK->answerbox.dispatched_calls);
-        ipc_cleanup_call_list(&TASK->answerbox.calls);
-        irq_spinlock_unlock(&TASK->answerbox.lock, true);
+        ipc_cleanup_call_list(&TASK->answerbox,
+            &TASK->answerbox.dispatched_calls);
+        ipc_cleanup_call_list(&TASK->answerbox, &TASK->answerbox.calls);
 
         ipc_forget_all_active_calls();