Changeset f2cb80a in mainline for kernel/generic/src/security/perm.c

Timestamp:

2024-02-23T17:57:23Z (3 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/security/perm.c (modified) (3 diffs)

kernel/generic/src/security/perm.c

@@ -89 +89 @@
                 return EPERM;
 
-        irq_spinlock_lock(&tasks_lock, true);
         task_t *task = task_find_by_id(taskid);
-
-        if ((!task) || (!container_check(CONTAINER, task->container))) {
-                irq_spinlock_unlock(&tasks_lock, true);
+        if (!task)
                 return ENOENT;
+
+        errno_t rc = ENOENT;
+
+        irq_spinlock_lock(&task->lock, true);
+        if (container_check(CONTAINER, task->container)) {
+                task->perms |= perms;
+                rc = EOK;
         }
-
-        irq_spinlock_lock(&task->lock, false);
-        task->perms |= perms;
-        irq_spinlock_unlock(&task->lock, false);
-
-        irq_spinlock_unlock(&tasks_lock, true);
-        return EOK;
+        irq_spinlock_unlock(&task->lock, true);
+
+        task_release(task);
+        return rc;
 }
 
@@ -118 +119 @@
 static errno_t perm_revoke(task_id_t taskid, perm_t perms)
 {
-        irq_spinlock_lock(&tasks_lock, true);
-
         task_t *task = task_find_by_id(taskid);
-        if ((!task) || (!container_check(CONTAINER, task->container))) {
-                irq_spinlock_unlock(&tasks_lock, true);
+        if (!task)
                 return ENOENT;
-        }
 
         /*
@@ -131 +128 @@
          * doesn't have PERM_PERM.
          */
-        irq_spinlock_lock(&TASK->lock, false);
-
-        if ((!(TASK->perms & PERM_PERM)) || (task != TASK)) {
-                irq_spinlock_unlock(&TASK->lock, false);
-                irq_spinlock_unlock(&tasks_lock, true);
+        if (task != TASK && !(perm_get(TASK) & PERM_PERM)) {
+                task_release(task);
                 return EPERM;
         }
 
-        task->perms &= ~perms;
-        irq_spinlock_unlock(&TASK->lock, false);
-
-        irq_spinlock_unlock(&tasks_lock, true);
-        return EOK;
+        errno_t rc = ENOENT;
+
+        irq_spinlock_lock(&task->lock, true);
+        if (container_check(CONTAINER, task->container)) {
+                task->perms &= ~perms;
+                rc = EOK;
+        }
+        irq_spinlock_unlock(&task->lock, true);
+
+        task_release(task);
+        return rc;
 }