Skip to content

Commit

Permalink
SELinux: null-terminate context string in selinux_xfrm_sec_ctx_alloc
Browse files Browse the repository at this point in the history
xfrm_audit_log() expects the context string to be null-terminated
which currently doesn't happen with user-supplied contexts.

Signed-off-by: Venkat Yekkirala <vyekkirala@TrustedCS.com>
Acked-by:  Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@namei.org>
  • Loading branch information
Venkat Yekkirala authored and James Morris committed Jul 25, 2007
1 parent 0de085b commit 910949a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion security/selinux/xfrm.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp,
return -ENOMEM;

*ctxp = ctx = kmalloc(sizeof(*ctx) +
uctx->ctx_len,
uctx->ctx_len + 1,
GFP_KERNEL);

if (!ctx)
Expand All @@ -229,6 +229,7 @@ static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp,
memcpy(ctx->ctx_str,
uctx+1,
ctx->ctx_len);
ctx->ctx_str[ctx->ctx_len] = 0;
rc = security_context_to_sid(ctx->ctx_str,
ctx->ctx_len,
&ctx->ctx_sid);
Expand Down

0 comments on commit 910949a

Please sign in to comment.