Changes in kernel/generic/src/ddi/ddi.c [597fa24:7d83c54] in mainline

File:

• kernel/generic/src/ddi/ddi.c (modified) (5 diffs)

kernel/generic/src/ddi/ddi.c

@@ -54 +54 @@
 #include <align.h>
 #include <errno.h>
-#include <memw.h>
+#include <mem.h>
 #include <trace.h>
 #include <bitops.h>
@@ -60 +60 @@
 
 /** This lock protects the @c pareas ordered dictionary. */
-static MUTEX_INITIALIZE(pareas_lock, MUTEX_PASSIVE);
+static mutex_t pareas_lock;
 
 /** Ordered dictionary of enabled physical memory areas by base address. */
@@ -74 +74 @@
 {
         odict_initialize(&pareas, pareas_getkey, pareas_cmp);
+        mutex_initialize(&pareas_lock, MUTEX_PASSIVE);
 }
 
@@ -335 +336 @@
                 return EPERM;
 
+        irq_spinlock_lock(&tasks_lock, true);
+
         task_t *task = task_find_by_id(id);
 
-        if (!task)
+        if ((!task) || (!container_check(CONTAINER, task->container))) {
+                /*
+                 * There is no task with the specified ID
+                 * or the task belongs to a different security
+                 * context.
+                 */
+                irq_spinlock_unlock(&tasks_lock, true);
                 return ENOENT;
-
-        errno_t rc = ENOENT;
-
-        irq_spinlock_lock(&task->lock, true);
-
-        /* Check that the task belongs to the correct security context. */
-        if (container_check(CONTAINER, task->container))
-                rc = ddi_iospace_enable_arch(task, ioaddr, size);
-
+        }
+
+        /* Lock the task and release the lock protecting tasks dictionary. */
+        irq_spinlock_exchange(&tasks_lock, &task->lock);
+        errno_t rc = ddi_iospace_enable_arch(task, ioaddr, size);
         irq_spinlock_unlock(&task->lock, true);
-        task_release(task);
+
         return rc;
 }
@@ -372 +377 @@
                 return EPERM;
 
+        irq_spinlock_lock(&tasks_lock, true);
+
         task_t *task = task_find_by_id(id);
 
-        if (!task)
+        if ((!task) || (!container_check(CONTAINER, task->container))) {
+                /*
+                 * There is no task with the specified ID
+                 * or the task belongs to a different security
+                 * context.
+                 */
+                irq_spinlock_unlock(&tasks_lock, true);
                 return ENOENT;
-
-        errno_t rc = ENOENT;
-
-        irq_spinlock_lock(&task->lock, true);
-
-        /* Check that the task belongs to the correct security context. */
-        if (container_check(CONTAINER, task->container))
-                rc = ddi_iospace_disable_arch(task, ioaddr, size);
-
+        }
+
+        /* Lock the task and release the lock protecting tasks dictionary. */
+        irq_spinlock_exchange(&tasks_lock, &task->lock);
+        errno_t rc = ddi_iospace_disable_arch(task, ioaddr, size);
         irq_spinlock_unlock(&task->lock, true);
-        task_release(task);
+
         return rc;
 }