From: Paul Moore <paul@paul-moore.com>
To: "Geyslan G. Bem" <geyslan@gmail.com>
Cc: linux-kernel@vger.kernel.org, Stephen Smalley <sds@tycho.nsa.gov>,
James Morris <james.l.morris@oracle.com>,
Eric Paris <eparis@parisplace.org>,
linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov
Subject: Re: [PATCH] selinux: fix possible memory leak
Date: Mon, 25 Nov 2013 17:02:59 -0500 [thread overview]
Message-ID: <15945270.AQEhGkaEur@sifl> (raw)
In-Reply-To: <1385293021-2767-1-git-send-email-geyslan@gmail.com>
On Sunday, November 24, 2013 08:37:01 AM Geyslan G. Bem wrote:
> Free 'ctx_str' when necessary.
>
> Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
> ---
> security/selinux/xfrm.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
Nice catch, applied.
> diff --git a/security/selinux/xfrm.c b/security/selinux/xfrm.c
> index a91d205..cf79a45 100644
> --- a/security/selinux/xfrm.c
> +++ b/security/selinux/xfrm.c
> @@ -327,19 +327,22 @@ int selinux_xfrm_state_alloc_acquire(struct xfrm_state
> *x, return rc;
>
> ctx = kmalloc(sizeof(*ctx) + str_len, GFP_ATOMIC);
> - if (!ctx)
> - return -ENOMEM;
> + if (!ctx) {
> + rc = -ENOMEM;
> + goto out;
> + }
>
> ctx->ctx_doi = XFRM_SC_DOI_LSM;
> ctx->ctx_alg = XFRM_SC_ALG_SELINUX;
> ctx->ctx_sid = secid;
> ctx->ctx_len = str_len;
> memcpy(ctx->ctx_str, ctx_str, str_len);
> - kfree(ctx_str);
>
> x->security = ctx;
> atomic_inc(&selinux_xfrm_refcount);
> - return 0;
> +out:
> + kfree(ctx_str);
> + return rc;
> }
>
> /*
--
paul moore
www.paul-moore.com
prev parent reply other threads:[~2013-11-25 22:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-24 11:37 [PATCH] selinux: fix possible memory leak Geyslan G. Bem
2013-11-25 22:02 ` Paul Moore [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=15945270.AQEhGkaEur@sifl \
--to=paul@paul-moore.com \
--cc=eparis@parisplace.org \
--cc=geyslan@gmail.com \
--cc=james.l.morris@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=sds@tycho.nsa.gov \
--cc=selinux@tycho.nsa.gov \
/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