lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf cgroup: Fix unmatched call to perf_detach_cgroup()

Browse Source 
In the failure path, we call perf_detach_cgroup(), but we didn't
call perf_get_cgroup() prio to it.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <4D6F346E.9070606@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Li Zefan
2011-03-03 14:25:50 +08:00
committed by Ingo Molnar
parent 3db272c049
commit f75e18cb96
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/perf_event.c
View File

@@ -412,6 +412,9 @@ static inline int perf_cgroup_connect(int fd, struct perf_event *event,
cgrp = container_of(css, struct perf_cgroup, css); cgrp = container_of(css, struct perf_cgroup, css);
event->cgrp = cgrp; event->cgrp = cgrp;
/* must be done before we fput() the file */
perf_get_cgroup(event);
/* /*
* all events in a group must monitor * all events in a group must monitor
* the same cgroup because a task belongs * the same cgroup because a task belongs
@@ -420,9 +423,6 @@ static inline int perf_cgroup_connect(int fd, struct perf_event *event,
if (group_leader && group_leader->cgrp != cgrp) { if (group_leader && group_leader->cgrp != cgrp) {
perf_detach_cgroup(event); perf_detach_cgroup(event);
ret = -EINVAL; ret = -EINVAL;
} else {
/* must be done before we fput() the file */
perf_get_cgroup(event);
} }
out: out:
fput_light(file, fput_needed); fput_light(file, fput_needed);