Commit 80492cc7 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  SELinux: null-terminate context string in selinux_xfrm_sec_ctx_alloc
parents a4fb2122 910949a6
...@@ -216,7 +216,7 @@ static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp, ...@@ -216,7 +216,7 @@ static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp,
return -ENOMEM; return -ENOMEM;
*ctxp = ctx = kmalloc(sizeof(*ctx) + *ctxp = ctx = kmalloc(sizeof(*ctx) +
uctx->ctx_len, uctx->ctx_len + 1,
GFP_KERNEL); GFP_KERNEL);
if (!ctx) if (!ctx)
...@@ -229,6 +229,7 @@ static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp, ...@@ -229,6 +229,7 @@ static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp,
memcpy(ctx->ctx_str, memcpy(ctx->ctx_str,
uctx+1, uctx+1,
ctx->ctx_len); ctx->ctx_len);
ctx->ctx_str[ctx->ctx_len] = 0;
rc = security_context_to_sid(ctx->ctx_str, rc = security_context_to_sid(ctx->ctx_str,
ctx->ctx_len, ctx->ctx_len,
&ctx->ctx_sid); &ctx->ctx_sid);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment