diff options
author | Li Zefan <lizf@cn.fujitsu.com> | 2011-03-03 01:25:37 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-03-04 05:32:50 -0500 |
commit | 3db272c0494900fcb905a201180a78cae3addd6e (patch) | |
tree | cc15a5c4004c26d847162353f752dad4d9dbb03e /kernel/perf_event.c | |
parent | 940c5b2971de443df22eed0441bc74fb0116e9f5 (diff) |
perf cgroup: Fix leak of file reference count
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>
Diffstat (limited to 'kernel/perf_event.c')
-rw-r--r-- | kernel/perf_event.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 821ce8221974..7c999e809ba3 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
@@ -404,8 +404,10 @@ static inline int perf_cgroup_connect(int fd, struct perf_event *event, | |||
404 | return -EBADF; | 404 | return -EBADF; |
405 | 405 | ||
406 | css = cgroup_css_from_dir(file, perf_subsys_id); | 406 | css = cgroup_css_from_dir(file, perf_subsys_id); |
407 | if (IS_ERR(css)) | 407 | if (IS_ERR(css)) { |
408 | return PTR_ERR(css); | 408 | ret = PTR_ERR(css); |
409 | goto out; | ||
410 | } | ||
409 | 411 | ||
410 | cgrp = container_of(css, struct perf_cgroup, css); | 412 | cgrp = container_of(css, struct perf_cgroup, css); |
411 | event->cgrp = cgrp; | 413 | event->cgrp = cgrp; |
@@ -422,6 +424,7 @@ static inline int perf_cgroup_connect(int fd, struct perf_event *event, | |||
422 | /* must be done before we fput() the file */ | 424 | /* must be done before we fput() the file */ |
423 | perf_get_cgroup(event); | 425 | perf_get_cgroup(event); |
424 | } | 426 | } |
427 | out: | ||
425 | fput_light(file, fput_needed); | 428 | fput_light(file, fput_needed); |
426 | return ret; | 429 | return ret; |
427 | } | 430 | } |