Changeset c6f0e3a2 in mainline

Timestamp:

2010-05-10T19:14:45Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

52c60b6

Parents:

e2fcdb1

Message:

Fix lock ordering in kbox_proc_hone_hungup().

File:

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

kernel/generic/src/ipc/kbox.c

@@ -126 +126 @@
         ipc_answer(&TASK->kb.box, call);
 
+        mutex_lock(&TASK->kb.cleanup_lock);
+
         ipl = interrupts_disable();
         spinlock_lock(&TASK->lock);
@@ -136 +138 @@
 
                 /* Only detach kbox thread unless already terminating. */
-                mutex_lock(&TASK->kb.cleanup_lock);
                 if (TASK->kb.finished == false) {
                         /* Detach kbox thread so it gets freed from memory. */
@@ -142 +143 @@
                         TASK->kb.thread = NULL;
                 }
-                mutex_unlock(&TASK->kb.cleanup_lock);
 
                 LOG("Phone list is empty.");
@@ -153 +153 @@
         spinlock_unlock(&TASK->lock);
         interrupts_restore(ipl);
+
+        mutex_unlock(&TASK->kb.cleanup_lock);
 }