Changeset 49115ac in mainline

Timestamp:

2017-08-19T11:03:47Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e7ac23d0

Parents:

e7c4115d

Message:

Add tsk_destructor() to free task's kobject

Freeing up kobject in task_destroy() leads to a kernel panic the next time the
task object is reused from the slab cache.

File:

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

kernel/generic/src/proc/task.c

@@ -84 +84 @@
 static void task_kill_internal(task_t *);
 static int tsk_constructor(void *, unsigned int);
+static size_t tsk_destructor(void *obj);
 
 /** Initialize kernel tasks support.
@@ -93 +94 @@
         avltree_create(&tasks_tree);
         task_slab = slab_cache_create("task_t", sizeof(task_t), 0,
-            tsk_constructor, NULL, 0);
+            tsk_constructor, tsk_destructor, 0);
 }
 
@@ -167 +168 @@
         
         list_initialize(&task->threads);
-        
+
         task->kobject = malloc(sizeof(kobject_t) * MAX_KERNEL_OBJECTS, 0);
         
@@ -182 +183 @@
 #endif
         
+        return 0;
+}
+
+size_t tsk_destructor(void *obj)
+{
+        task_t *task = (task_t *) obj;
+        
+        free(task->kobject);
         return 0;
 }
@@ -285 +294 @@
         as_release(task->as);
         
-        free(task->kobject);
-
         slab_free(task_slab, task);
 }