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

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

security/selinux/xfrm.c

+2 −1
Original line number Diff line number Diff line
@@ -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)
@@ -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);