oprofile: Free potentially owned tasks in case of errors
authorRobert Richter <robert.richter@amd.com>
Thu, 26 May 2011 16:22:54 +0000 (18:22 +0200)
committerRobert Richter <robert.richter@amd.com>
Tue, 31 May 2011 14:33:33 +0000 (16:33 +0200)
After registering the task free notifier we possibly have tasks in our
dying_tasks list. Free them after unregistering the notifier in case
of an error.

Cc: <stable@kernel.org> # .36+
Signed-off-by: Robert Richter <robert.richter@amd.com>
drivers/oprofile/buffer_sync.c

index a3984f4ef192a1807ed4714d70babb6702a175d8..04250aa16f513a5823669bf4026fe4c112fad374 100644 (file)
@@ -141,6 +141,13 @@ static struct notifier_block module_load_nb = {
        .notifier_call = module_load_notify,
 };
 
+static void free_all_tasks(void)
+{
+       /* make sure we don't leak task structs */
+       process_task_mortuary();
+       process_task_mortuary();
+}
+
 int sync_start(void)
 {
        int err;
@@ -174,6 +181,7 @@ out3:
        profile_event_unregister(PROFILE_TASK_EXIT, &task_exit_nb);
 out2:
        task_handoff_unregister(&task_free_nb);
+       free_all_tasks();
 out1:
        free_cpumask_var(marked_cpus);
        goto out;
@@ -192,10 +200,7 @@ void sync_stop(void)
        mutex_unlock(&buffer_mutex);
        flush_cpu_work();
 
-       /* make sure we don't leak task structs */
-       process_task_mortuary();
-       process_task_mortuary();
-
+       free_all_tasks();
        free_cpumask_var(marked_cpus);
 }