From: Li Zefan <lizf@cn.fujitsu.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>,
Stephane Eranian <eranian@google.com>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 1/4] perf cgroup: Fix leak of file reference count
Date: Thu, 03 Mar 2011 14:25:37 +0800 [thread overview]
Message-ID: <4D6F3461.6060406@cn.fujitsu.com> (raw)
In perf_cgroup_connect(), fput_light() is missing in a failure
path.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
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 64a018e..4a955fd 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;
}
--
1.6.3
next reply other threads:[~2011-03-03 6:23 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-03 6:25 Li Zefan [this message]
2011-03-03 6:25 ` [PATCH 2/4] perf cgroup: Fix unmatched call to perf_detach_cgroup() Li Zefan
2011-03-03 7:41 ` Stephane Eranian
2011-03-04 11:51 ` [tip:perf/core] " tip-bot for Li Zefan
2011-03-03 6:26 ` [PATCH 3/4] perf cgroup: Clean up perf_cgroup_create() Li Zefan
2011-03-03 7:42 ` Stephane Eranian
2011-03-03 8:37 ` Stephane Eranian
2011-03-03 8:40 ` Stephane Eranian
2011-03-04 11:51 ` [tip:perf/core] " tip-bot for Li Zefan
2011-03-03 6:26 ` [PATCH 4/4] perf cgroup: Fix a typo in kernel config Li Zefan
2011-03-04 11:52 ` [tip:perf/core] " tip-bot for Li Zefan
2011-03-03 7:40 ` [PATCH 1/4] perf cgroup: Fix leak of file reference count Stephane Eranian
2011-03-03 10:35 ` Peter Zijlstra
2011-03-04 11:50 ` [tip:perf/core] " tip-bot for Li Zefan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D6F3461.6060406@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=eranian@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox