diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-10-31 16:47:19 +1100 |
|---|---|---|
| committer | James Morris <jmorris@sdv.(none)> | 2007-11-08 08:55:04 +1100 |
| commit | 57002bfb31283e84f694763ed4db0fb761b7d6a9 (patch) | |
| tree | 7788e55754cbe3a86fdd7e73a1e5e15e2cb8ff1a /security/selinux | |
| parent | dbeeb816e805091e7cfc03baf36dc40b4adb2bbd (diff) | |
| download | op-kernel-dev-57002bfb31283e84f694763ed4db0fb761b7d6a9.zip op-kernel-dev-57002bfb31283e84f694763ed4db0fb761b7d6a9.tar.gz | |
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: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux')
| -rw-r--r-- | security/selinux/xfrm.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/security/selinux/xfrm.c b/security/selinux/xfrm.c index 36a191e..e076039 100644 --- a/security/selinux/xfrm.c +++ b/security/selinux/xfrm.c @@ -211,26 +211,27 @@ static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp, if (uctx->ctx_doi != XFRM_SC_ALG_SELINUX) return -EINVAL; - if (uctx->ctx_len >= PAGE_SIZE) + str_len = uctx->ctx_len; + if (str_len >= PAGE_SIZE) return -ENOMEM; *ctxp = ctx = kmalloc(sizeof(*ctx) + - uctx->ctx_len + 1, + str_len + 1, GFP_KERNEL); if (!ctx) return -ENOMEM; ctx->ctx_doi = uctx->ctx_doi; - ctx->ctx_len = uctx->ctx_len; + ctx->ctx_len = str_len; ctx->ctx_alg = uctx->ctx_alg; memcpy(ctx->ctx_str, uctx+1, - ctx->ctx_len); - ctx->ctx_str[ctx->ctx_len] = 0; + str_len); + ctx->ctx_str[str_len] = 0; rc = security_context_to_sid(ctx->ctx_str, - ctx->ctx_len, + str_len, &ctx->ctx_sid); if (rc) |
