Commit 57002bfb authored by Stephen Rothwell's avatar Stephen Rothwell Committed by James Morris

SELinux: suppress a warning for 64k pages.

On PowerPC allmodconfig build we get this:

security/selinux/xfrm.c:214: warning: comparison is always false due to limited range of data type
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent dbeeb816
...@@ -211,26 +211,27 @@ static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp, ...@@ -211,26 +211,27 @@ static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp,
if (uctx->ctx_doi != XFRM_SC_ALG_SELINUX) if (uctx->ctx_doi != XFRM_SC_ALG_SELINUX)
return -EINVAL; return -EINVAL;
if (uctx->ctx_len >= PAGE_SIZE) str_len = uctx->ctx_len;
if (str_len >= PAGE_SIZE)
return -ENOMEM; return -ENOMEM;
*ctxp = ctx = kmalloc(sizeof(*ctx) + *ctxp = ctx = kmalloc(sizeof(*ctx) +
uctx->ctx_len + 1, str_len + 1,
GFP_KERNEL); GFP_KERNEL);
if (!ctx) if (!ctx)
return -ENOMEM; return -ENOMEM;
ctx->ctx_doi = uctx->ctx_doi; ctx->ctx_doi = uctx->ctx_doi;
ctx->ctx_len = uctx->ctx_len; ctx->ctx_len = str_len;
ctx->ctx_alg = uctx->ctx_alg; ctx->ctx_alg = uctx->ctx_alg;
memcpy(ctx->ctx_str, memcpy(ctx->ctx_str,
uctx+1, uctx+1,
ctx->ctx_len); str_len);
ctx->ctx_str[ctx->ctx_len] = 0; ctx->ctx_str[str_len] = 0;
rc = security_context_to_sid(ctx->ctx_str, rc = security_context_to_sid(ctx->ctx_str,
ctx->ctx_len, str_len,
&ctx->ctx_sid); &ctx->ctx_sid);
if (rc) if (rc)
......
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