From: "Paul Menage" <menage@google.com>
To: "Li Zefan" <lizf@cn.fujitsu.com>
Cc: "Andrew Morton" <akpm@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>,
"Linux Containers" <containers@lists.linux-foundation.org>
Subject: Re: [PATCH] cgroup: fix possible memory leak
Date: Wed, 30 Jul 2008 01:16:40 -0700 [thread overview]
Message-ID: <6599ad830807300116x13c308bck80b0629e5808357f@mail.gmail.com> (raw)
In-Reply-To: <488D2D08.2090903@cn.fujitsu.com>
On Sun, Jul 27, 2008 at 7:20 PM, Li Zefan <lizf@cn.fujitsu.com> wrote:
> There's a leak if copy_from_user() returns failure.
>
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Paul Menage <menage@google.com>
Thanks, good catch.
> ---
> kernel/cgroup.c | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/cgroup.c b/kernel/cgroup.c
> index 657f8f8..28debe4 100644
> --- a/kernel/cgroup.c
> +++ b/kernel/cgroup.c
> @@ -1424,14 +1424,17 @@ static ssize_t cgroup_write_string(struct cgroup *cgrp, struct cftype *cft,
> if (buffer == NULL)
> return -ENOMEM;
> }
> - if (nbytes && copy_from_user(buffer, userbuf, nbytes))
> - return -EFAULT;
> + if (nbytes && copy_from_user(buffer, userbuf, nbytes)) {
> + retval = -EFAULT;
> + goto out;
> + }
>
> buffer[nbytes] = 0; /* nul-terminate */
> strstrip(buffer);
> retval = cft->write_string(cgrp, cft, buffer);
> if (!retval)
> retval = nbytes;
> +out:
> if (buffer != local_buffer)
> kfree(buffer);
> return retval;
> --
> 1.5.4.rc3
>
prev parent reply other threads:[~2008-07-30 8:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-28 2:20 Li Zefan
2008-07-30 8:16 ` Paul Menage [this message]
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=6599ad830807300116x13c308bck80b0629e5808357f@mail.gmail.com \
--to=menage@google.com \
--cc=akpm@linux-foundation.org \
--cc=containers@lists.linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
/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
all inboxes | Powered by JetHome®