From: "Serge E. Hallyn" <serue@us.ibm.com>
To: Jiri Slaby <jslaby@suse.cz>
Cc: jmorris@namei.org, linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org, jirislaby@gmail.com,
David Howells <dhowells@redhat.com>
Subject: Re: [PATCH 1/1] cred: fix memory leak
Date: Wed, 6 Jan 2010 11:25:41 -0600 [thread overview]
Message-ID: <20100106172541.GB15784@us.ibm.com> (raw)
In-Reply-To: <1262797265-26557-1-git-send-email-jslaby@suse.cz>
Quoting Jiri Slaby (jslaby@suse.cz):
> Stanse found a memory leak in prepare_exec_creds. tgcred is not
> freed/assigned on all paths. Fix that.
>
> I.e. unifdef tgcred and add kfree(tgcred); as it is initialized to
> NULL already.
Does this compile with CONFIG_KEYS=n, , though? I don't see a dummy
define for struct thread_group_cred in cred.h. Should this patch add
one?
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> Cc: David Howells <dhowells@redhat.com>
> Cc: James Morris <jmorris@namei.org>
> Cc: Serge Hallyn <serue@us.ibm.com>
> ---
> kernel/cred.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/cred.c b/kernel/cred.c
> index dd76cfe..0e10f73 100644
> --- a/kernel/cred.c
> +++ b/kernel/cred.c
> @@ -351,9 +351,7 @@ struct cred *prepare_exec_creds(void)
> */
> struct cred *prepare_usermodehelper_creds(void)
> {
> -#ifdef CONFIG_KEYS
> struct thread_group_cred *tgcred = NULL;
> -#endif
> struct cred *new;
>
> #ifdef CONFIG_KEYS
> @@ -363,8 +361,10 @@ struct cred *prepare_usermodehelper_creds(void)
> #endif
>
> new = kmem_cache_alloc(cred_jar, GFP_ATOMIC);
> - if (!new)
> + if (!new) {
> + kfree(tgcred);
> return NULL;
> + }
>
> kdebug("prepare_usermodehelper_creds() alloc %p", new);
>
> --
> 1.6.5.7
next prev parent reply other threads:[~2010-01-06 17:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-06 17:01 Jiri Slaby
2010-01-06 17:06 ` David Howells
2010-01-06 17:25 ` Serge E. Hallyn [this message]
2010-01-06 17:31 ` Jiri Slaby
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=20100106172541.GB15784@us.ibm.com \
--to=serue@us.ibm.com \
--cc=dhowells@redhat.com \
--cc=jirislaby@gmail.com \
--cc=jmorris@namei.org \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.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
Powered by JetHome