Skip to content

Commit

Permalink
perf: Fix task refcount bugs
Browse files Browse the repository at this point in the history
Currently it looks like find_lively_task_by_vpid() takes a task ref
and relies on find_get_context() to drop it.

The problem is that perf_event_create_kernel_counter() shouldn't be
dropping task refs.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Acked-by: Matt Helsley <matthltc@us.ibm.com>
LKML-Reference: <20101014203625.278436085@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Oct 18, 2010
1 parent 74c3337 commit e7d0bc0
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions kernel/perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -2190,11 +2190,9 @@ find_get_context(struct pmu *pmu, struct task_struct *task, int cpu)
}
}

put_task_struct(task);
return ctx;

errout:
put_task_struct(task);
return ERR_PTR(err);
}

Expand Down Expand Up @@ -5602,7 +5600,7 @@ SYSCALL_DEFINE5(perf_event_open,
ctx = find_get_context(pmu, task, cpu);
if (IS_ERR(ctx)) {
err = PTR_ERR(ctx);
goto err_group_fd;
goto err_task;
}

/*
Expand Down Expand Up @@ -5698,6 +5696,9 @@ SYSCALL_DEFINE5(perf_event_open,

err_context:
put_ctx(ctx);
err_task:
if (task)
put_task_struct(task);
err_group_fd:
fput_light(group_file, fput_needed);
free_event(event);
Expand Down

0 comments on commit e7d0bc0

Please sign in to comment.