Skip to content

Commit

Permalink
perf cgroup: Fix unmatched call to perf_detach_cgroup()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Li Zefan authored and Ingo Molnar committed Mar 4, 2011
1 parent 3db272c commit f75e18c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions kernel/perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,9 @@ static inline int perf_cgroup_connect(int fd, struct perf_event *event,
cgrp = container_of(css, struct perf_cgroup, css);
event->cgrp = cgrp;

/* must be done before we fput() the file */
perf_get_cgroup(event);

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

0 comments on commit f75e18c

Please sign in to comment.