diff options
| author | Robert Richter <robert.richter@amd.com> | 2011-12-07 18:30:10 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-21 13:04:51 -0800 |
| commit | 0faa8aa92a6fe975a8315c703999d2e3a250d370 (patch) | |
| tree | deffed0c268024052e2ca6f0ac7ba8471c18abd3 | |
| parent | 372dfcdb6d71bb4d8a922a70d64702fc9e5792d4 (diff) | |
oprofile: Free potentially owned tasks in case of errors
commit 6ac6519b93065625119a347be1cbcc1b89edb773 upstream.
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.
Signed-off-by: Robert Richter <robert.richter@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/oprofile/buffer_sync.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c index 5c4df24eae4b..6495ae0bd728 100644 --- a/drivers/oprofile/buffer_sync.c +++ b/drivers/oprofile/buffer_sync.c @@ -140,6 +140,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; @@ -173,6 +180,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; @@ -191,10 +199,7 @@ void sync_stop(void) mutex_unlock(&buffer_mutex); flush_scheduled_work(); - /* make sure we don't leak task structs */ - process_task_mortuary(); - process_task_mortuary(); - + free_all_tasks(); free_cpumask_var(marked_cpus); } |