Changeset c46bfbc in mainline

Timestamp:

2017-10-10T15:34:37Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

33f86a3

Parents:

cccd60c3

Message:

Allow caps_task_alloc() to fail

Location:

kernel/generic

Files:

• include/cap/cap.h (modified) (1 diff)
• src/cap/cap.c (modified) (1 diff)
• src/proc/task.c (modified) (2 diffs)

kernel/generic/include/cap/cap.h

@@ -111 +111 @@
 } cap_info_t;
 
-extern void caps_task_alloc(struct task *);
+extern int caps_task_alloc(struct task *);
 extern void caps_task_free(struct task *);
 extern void caps_task_init(struct task *);

kernel/generic/src/cap/cap.c

@@ -114 +114 @@
  * @param task  Task for which to allocate the info structure.
  */
-void caps_task_alloc(task_t *task)
-{
-        task->cap_info = (cap_info_t *) malloc(sizeof(cap_info_t), 0);
+int caps_task_alloc(task_t *task)
+{
+        task->cap_info = (cap_info_t *) malloc(sizeof(cap_info_t),
+            FRAME_ATOMIC);
+        if (!task->cap_info)
+                return ENOMEM;
         task->cap_info->handles = ra_arena_create();
-        // FIXME: allow caps_task_alloc() to fail 
-        assert(task->cap_info->handles);
-        bool success = ra_span_add(task->cap_info->handles, 0, MAX_CAPS);
-        // FIXME: allow caps_task_alloc() to fail 
-        assert(success);
-        success = hash_table_create(&task->cap_info->caps, 0, 0, &caps_ops);
-        // FIXME: allow caps_task_alloc() to fail 
-        assert(success);
+        if (!task->cap_info->handles)
+                goto error_handles;
+        if (!ra_span_add(task->cap_info->handles, 0, MAX_CAPS))
+                goto error_span;
+        if (!hash_table_create(&task->cap_info->caps, 0, 0, &caps_ops))
+                goto error_span;
+        return EOK;
+
+error_span:
+        ra_arena_destroy(task->cap_info->handles);
+error_handles:
+        free(task->cap_info);
+        return ENOMEM;
 }
 

kernel/generic/src/proc/task.c

@@ -161 +161 @@
 {
         task_t *task = (task_t *) obj;
+
+        int rc = caps_task_alloc(task);
+        if (rc != EOK)
+                return rc;
         
         atomic_set(&task->refcount, 0);
@@ -168 +172 @@
         
         list_initialize(&task->threads);
-        
-        caps_task_alloc(task);
         
         ipc_answerbox_init(&task->answerbox, task);