[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Thu, 3 Mar 2011 08:40:42 +0100
From: Stephane Eranian <eranian@...gle.com>
To: Li Zefan <lizf@...fujitsu.com>
Cc: Ingo Molnar <mingo@...e.hu>, Peter Zijlstra <peterz@...radead.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 1/4] perf cgroup: Fix leak of file reference count
On Thu, Mar 3, 2011 at 7:25 AM, Li Zefan <lizf@...fujitsu.com> wrote:
> In perf_cgroup_connect(), fput_light() is missing in a failure
> path.
>
Yes, you're right.
> Signed-off-by: Li Zefan <lizf@...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
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists