Changes in kernel/generic/src/security/perm.c [07d4271:5a5269d] in mainline

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)
+
+        if ((!task) || (!container_check(CONTAINER, task->container))) {
+                irq_spinlock_unlock(&tasks_lock, true);
                 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_unlock(&task->lock, true);
-
-        task_release(task);
-        return rc;
+
+        irq_spinlock_lock(&task->lock, false);
+        task->perms |= perms;
+        irq_spinlock_unlock(&task->lock, false);
+
+        irq_spinlock_unlock(&tasks_lock, true);
+        return EOK;
 }
 
@@ -119 +118 @@
 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)
+        if ((!task) || (!container_check(CONTAINER, task->container))) {
+                irq_spinlock_unlock(&tasks_lock, true);
                 return ENOENT;
+        }
 
         /*
@@ -128 +131 @@
          * doesn't have PERM_PERM.
          */
-        if (task != TASK && !(perm_get(TASK) & PERM_PERM)) {
-                task_release(task);
+        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);
                 return EPERM;
         }
 
-        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;
+        task->perms &= ~perms;
+        irq_spinlock_unlock(&TASK->lock, false);
+
+        irq_spinlock_unlock(&tasks_lock, true);
+        return EOK;
 }