Changes in kernel/generic/src/proc/task.c [07d4271:455241b] in mainline

File:

• kernel/generic/src/proc/task.c (modified) (4 diffs)

kernel/generic/src/proc/task.c

@@ -201 +201 @@
                 return NULL;
 
+        if (caps_task_init(task) != EOK) {
+                slab_free(task_cache, task);
+                return NULL;
+        }
+
         refcount_init(&task->refcount);
 
@@ -212 +217 @@
         task->ucycles = 0;
         task->kcycles = 0;
-
-        caps_task_init(task);
 
         task->ipc_info.call_sent = 0;
@@ -248 +251 @@
                 }
 
-                kobject_t *phone_obj = kobject_get(task, phone_handle,
-                    KOBJECT_TYPE_PHONE);
-                (void) ipc_phone_connect(phone_obj->phone, ipc_box_0);
+                phone_t *phone = phone_from_kobject(
+                    kobject_get(task, phone_handle, KOBJECT_TYPE_PHONE));
+                (void) ipc_phone_connect(phone, ipc_box_0);
         }
 
@@ -287 +290 @@
          */
         as_release(task->as);
+
+        caps_task_clear(task);
 
         slab_free(task_cache, task);