Changes in kernel/generic/src/proc/task.c [c46bfbc:7f11dc6] in mainline

File:

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

kernel/generic/src/proc/task.c

@@ -79 +79 @@
 static task_id_t task_counter = 0;
 
-static slab_cache_t *task_slab;
+static slab_cache_t *task_cache;
 
 /* Forward declarations. */
@@ -93 +93 @@
         TASK = NULL;
         avltree_create(&tasks_tree);
-        task_slab = slab_cache_create("task_t", sizeof(task_t), 0,
+        task_cache = slab_cache_create("task_t", sizeof(task_t), 0,
             tsk_constructor, tsk_destructor, 0);
 }
@@ -185 +185 @@
 #endif
         
-        return 0;
+        return EOK;
 }
 
@@ -206 +206 @@
 task_t *task_create(as_t *as, const char *name)
 {
-        task_t *task = (task_t *) slab_alloc(task_slab, 0);
+        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;
+                int 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);
@@ -295 +307 @@
         as_release(task->as);
         
-        slab_free(task_slab, task);
+        slab_free(task_cache, task);
 }