Skip to content

Commit

Permalink
perf cgroup: Fix leak of file reference count
Browse files Browse the repository at this point in the history
In perf_cgroup_connect(), fput_light() is missing in a failure path.

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: <4D6F3461.6060406@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 940c5b2 commit 3db272c
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions kernel/perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,10 @@ static inline int perf_cgroup_connect(int fd, struct perf_event *event,
return -EBADF;

css = cgroup_css_from_dir(file, perf_subsys_id);
if (IS_ERR(css))
return PTR_ERR(css);
if (IS_ERR(css)) {
ret = PTR_ERR(css);
goto out;
}

cgrp = container_of(css, struct perf_cgroup, css);
event->cgrp = cgrp;
Expand All @@ -422,6 +424,7 @@ static inline int perf_cgroup_connect(int fd, struct perf_event *event,
/* must be done before we fput() the file */
perf_get_cgroup(event);
}
out:
fput_light(file, fput_needed);
return ret;
}
Expand Down

0 comments on commit 3db272c

Please sign in to comment.