lkml.org 
[lkml]   [2011]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip:perf/core] perf cgroup: Fix leak of file reference count
Commit-ID:  3db272c0494900fcb905a201180a78cae3addd6e
Gitweb: http://git.kernel.org/tip/3db272c0494900fcb905a201180a78cae3addd6e
Author: Li Zefan <lizf@cn.fujitsu.com>
AuthorDate: Thu, 3 Mar 2011 14:25:37 +0800
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 4 Mar 2011 11:32:50 +0100

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>
---
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 821ce82..7c999e8 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,
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;
@@ -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;
}

\
 
 \ /
  Last update: 2011-03-06 11:17    [W:0.119 / U:16.632 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site