Changeset 6caf5fb in mainline for kernel/generic/src/proc/task.c

Timestamp:

2025-01-16T21:42:15Z (20 hours ago)

Author:

GitHub <noreply@…>

Parents:

e0e2264 (diff), 455241b (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:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-01-16 21:42:15)

git-committer:

GitHub <noreply@…> (2025-01-16 21:42:15)

Message:

Merge 455241b37bedd3719ed3b5b025fdf26f44fd565b into e0e22648f5799cc98671695e153b0b00037daeb9

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);