Changeset f2cb80a in mainline for kernel/generic/src/ddi/ddi.c

Timestamp:

2024-02-23T17:57:23Z (11 months ago)

Author:

GitHub <noreply@…>

Children:

192019f

Parents:

86f862c (diff), 90ba06c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-02-23 17:57:23)

git-committer:

GitHub <noreply@…> (2024-02-23 17:57:23)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

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

kernel/generic/src/ddi/ddi.c

@@ -336 +336 @@
                 return EPERM;
 
-        irq_spinlock_lock(&tasks_lock, true);
-
         task_t *task = task_find_by_id(id);
 
-        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);
+        if (!task)
                 return ENOENT;
-        }
-
-        /* 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);
+
+        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);
+
         irq_spinlock_unlock(&task->lock, true);
-
+        task_release(task);
         return rc;
 }
@@ -377 +373 @@
                 return EPERM;
 
-        irq_spinlock_lock(&tasks_lock, true);
-
         task_t *task = task_find_by_id(id);
 
-        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);
+        if (!task)
                 return ENOENT;
-        }
-
-        /* 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);
+
+        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);
+
         irq_spinlock_unlock(&task->lock, true);
-
+        task_release(task);
         return rc;
 }