aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorGeyslan G. Bem <geyslan@gmail.com>2013-11-24 08:37:01 -0300
committerPaul Moore <pmoore@redhat.com>2013-11-25 17:00:33 -0500
commit8e645c345a4cf6b8b13054b4ec2f6371f05876a9 (patch)
treed81d01ba23cb6dc1b12396d4992fea48e1b5b0ee /security
parentb5495b4217d3fa64deac479db83dbede149af7d8 (diff)
downloadlinux-stericsson-8e645c345a4cf6b8b13054b4ec2f6371f05876a9.tar.gz
selinux: fix possible memory leak
Free 'ctx_str' when necessary. Signed-off-by: Geyslan G. Bem <geyslan@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Paul Moore <pmoore@redhat.com>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/xfrm.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/security/selinux/xfrm.c b/security/selinux/xfrm.c
index a91d205ec0c6..cf79a4564e38 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;
}
/*