Changes in kernel/generic/src/proc/task.c [82d515e9:b2e121a] in mainline

File:

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

kernel/generic/src/proc/task.c

@@ -56 +56 @@
 #include <print.h>
 #include <errno.h>
-#include <func.h>
+#include <halt.h>
 #include <str.h>
 #include <syscall/copy.h>
@@ -83 +83 @@
 /* Forward declarations. */
 static void task_kill_internal(task_t *);
-static int tsk_constructor(void *, unsigned int);
+static errno_t tsk_constructor(void *, unsigned int);
 static size_t tsk_destructor(void *obj);
 
@@ -158 +158 @@
 }
 
-int tsk_constructor(void *obj, unsigned int kmflags)
+errno_t tsk_constructor(void *obj, unsigned int kmflags)
 {
         task_t *task = (task_t *) obj;
 
-        int rc = caps_task_alloc(task);
+        errno_t rc = caps_task_alloc(task);
         if (rc != EOK)
                 return rc;
@@ -185 +185 @@
 #endif
         
-        return 0;
+        return EOK;
 }
 
@@ -207 +207 @@
 {
         task_t *task = (task_t *) slab_alloc(task_cache, 0);
+        if (task == NULL) {
+                return NULL;
+        }
+        
         task_create_arch(task);
         
@@ -241 +245 @@
         if ((ipc_phone_0) &&
             (container_check(ipc_phone_0->task->container, task->container))) {
-                cap_handle_t phone_handle = phone_alloc(task);
+                cap_handle_t phone_handle;
+                errno_t rc = phone_alloc(task, &phone_handle);
+                if (rc != EOK) {
+                        task->as = NULL;
+                        task_destroy_arch(task);
+                        slab_free(task_cache, task);
+                        return NULL;
+                }
+                
                 kobject_t *phone_obj = kobject_get(task, phone_handle,
                     KOBJECT_TYPE_PHONE);
@@ -333 +345 @@
  *
  */
-sysarg_t sys_task_get_id(sysarg64_t *uspace_taskid)
+sys_errno_t sys_task_get_id(sysarg64_t *uspace_taskid)
 {
         /*
@@ -339 +351 @@
          * the lifespan of the task.
          */
-        return (sysarg_t) copy_to_uspace(uspace_taskid, &TASK->taskid,
+        return (sys_errno_t) copy_to_uspace(uspace_taskid, &TASK->taskid,
             sizeof(TASK->taskid));
 }
@@ -373 +385 @@
  *
  */
-sysarg_t sys_task_set_name(const char *uspace_name, size_t name_len)
+sys_errno_t sys_task_set_name(const char *uspace_name, size_t name_len)
 {
         char namebuf[TASK_NAME_BUFLEN];
@@ -381 +393 @@
                 name_len = TASK_NAME_BUFLEN - 1;
         
-        int rc = copy_from_uspace(namebuf, uspace_name, name_len);
-        if (rc != 0)
-                return (sysarg_t) rc;
+        errno_t rc = copy_from_uspace(namebuf, uspace_name, name_len);
+        if (rc != EOK)
+                return (sys_errno_t) rc;
         
         namebuf[name_len] = '\0';
@@ -414 +426 @@
  *
  */
-sysarg_t sys_task_kill(task_id_t *uspace_taskid)
+sys_errno_t sys_task_kill(task_id_t *uspace_taskid)
 {
         task_id_t taskid;
-        int rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(taskid));
-        if (rc != 0)
-                return (sysarg_t) rc;
-        
-        return (sysarg_t) task_kill(taskid);
+        errno_t rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(taskid));
+        if (rc != EOK)
+                return (sys_errno_t) rc;
+        
+        return (sys_errno_t) task_kill(taskid);
 }
 
@@ -527 +539 @@
  *
  */
-int task_kill(task_id_t id)
+errno_t task_kill(task_id_t id)
 {
         if (id == 1)
@@ -584 +596 @@
  *
  */
-sysarg_t sys_task_exit(sysarg_t notify)
+sys_errno_t sys_task_exit(sysarg_t notify)
 {
         task_kill_self(notify);