aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/perf_event.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 346dc0e35a0a..f928878a1c17 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -2190,11 +2190,9 @@ retry:
2190 } 2190 }
2191 } 2191 }
2192 2192
2193 put_task_struct(task);
2194 return ctx; 2193 return ctx;
2195 2194
2196errout: 2195errout:
2197 put_task_struct(task);
2198 return ERR_PTR(err); 2196 return ERR_PTR(err);
2199} 2197}
2200 2198
@@ -5602,7 +5600,7 @@ SYSCALL_DEFINE5(perf_event_open,
5602 ctx = find_get_context(pmu, task, cpu); 5600 ctx = find_get_context(pmu, task, cpu);
5603 if (IS_ERR(ctx)) { 5601 if (IS_ERR(ctx)) {
5604 err = PTR_ERR(ctx); 5602 err = PTR_ERR(ctx);
5605 goto err_group_fd; 5603 goto err_task;
5606 } 5604 }
5607 5605
5608 /* 5606 /*
@@ -5698,6 +5696,9 @@ SYSCALL_DEFINE5(perf_event_open,
5698 5696
5699err_context: 5697err_context:
5700 put_ctx(ctx); 5698 put_ctx(ctx);
5699err_task:
5700 if (task)
5701 put_task_struct(task);
5701err_group_fd: 5702err_group_fd:
5702 fput_light(group_file, fput_needed); 5703 fput_light(group_file, fput_needed);
5703 free_event(event); 5704 free_event(event);