Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gss_krb5: prepare for new context format

Browse source 
Prepare for new context format by splitting out the old "v1"
context processing function

Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
Signed-off-by: Steve Dickson <steved@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Kevin Coffman 2010-03-17 13:02:50 -04:00 committed by Trond Myklebust
parent 1ac3719a22
commit a8cc1cb7d7
1 changed files with 39 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
net/sunrpc/auth_gss/gss_krb5_mech.c
View file

@ -123,53 +123,47 @@ get_key(const void *p, const void *end, struct crypto_blkcipher **res)
} }
static int static int
gss_import_sec_context_kerberos(const void *p, gss_import_v1_context(const void *p, const void *end, struct krb5_ctx *ctx)
size_t len,
struct gss_ctx *ctx_id)
{ {
const void *end = (const void *)((const char *)p + len);
struct krb5_ctx *ctx;
int tmp; int tmp;
if (!(ctx = kzalloc(sizeof(*ctx), GFP_NOFS))) {
p = ERR_PTR(-ENOMEM);
goto out_err;
}
p = simple_get_bytes(p, end, &ctx->initiate, sizeof(ctx->initiate)); p = simple_get_bytes(p, end, &ctx->initiate, sizeof(ctx->initiate));
if (IS_ERR(p)) if (IS_ERR(p))
goto out_err_free_ctx; goto out_err;
/* Old format supports only DES! Any other enctype uses new format */
ctx->enctype = ENCTYPE_DES_CBC_RAW; ctx->enctype = ENCTYPE_DES_CBC_RAW;
/* The downcall format was designed before we completely understood /* The downcall format was designed before we completely understood
* the uses of the context fields; so it includes some stuff we * the uses of the context fields; so it includes some stuff we
* just give some minimal sanity-checking, and some we ignore * just give some minimal sanity-checking, and some we ignore
* completely (like the next twenty bytes): */ * completely (like the next twenty bytes): */
if (unlikely(p + 20 > end || p + 20 < p)) if (unlikely(p + 20 > end || p + 20 < p))
goto out_err_free_ctx; goto out_err;
p += 20; p += 20;
p = simple_get_bytes(p, end, &tmp, sizeof(tmp)); p = simple_get_bytes(p, end, &tmp, sizeof(tmp));
if (IS_ERR(p)) if (IS_ERR(p))
goto out_err_free_ctx; goto out_err;
if (tmp != SGN_ALG_DES_MAC_MD5) { if (tmp != SGN_ALG_DES_MAC_MD5) {
p = ERR_PTR(-ENOSYS); p = ERR_PTR(-ENOSYS);
goto out_err_free_ctx; goto out_err;
} }
p = simple_get_bytes(p, end, &tmp, sizeof(tmp)); p = simple_get_bytes(p, end, &tmp, sizeof(tmp));
if (IS_ERR(p)) if (IS_ERR(p))
goto out_err_free_ctx; goto out_err;
if (tmp != SEAL_ALG_DES) { if (tmp != SEAL_ALG_DES) {
p = ERR_PTR(-ENOSYS); p = ERR_PTR(-ENOSYS);
goto out_err_free_ctx; goto out_err;
} }
p = simple_get_bytes(p, end, &ctx->endtime, sizeof(ctx->endtime)); p = simple_get_bytes(p, end, &ctx->endtime, sizeof(ctx->endtime));
if (IS_ERR(p)) if (IS_ERR(p))
goto out_err_free_ctx; goto out_err;
p = simple_get_bytes(p, end, &ctx->seq_send, sizeof(ctx->seq_send)); p = simple_get_bytes(p, end, &ctx->seq_send, sizeof(ctx->seq_send));
if (IS_ERR(p)) if (IS_ERR(p))
goto out_err_free_ctx; goto out_err;
p = simple_get_netobj(p, end, &ctx->mech_used); p = simple_get_netobj(p, end, &ctx->mech_used);
if (IS_ERR(p)) if (IS_ERR(p))
goto out_err_free_ctx; goto out_err;
p = get_key(p, end, &ctx->enc); p = get_key(p, end, &ctx->enc);
if (IS_ERR(p)) if (IS_ERR(p))
goto out_err_free_mech; goto out_err_free_mech;
@ -181,9 +175,6 @@ gss_import_sec_context_kerberos(const void *p,
goto out_err_free_key2; goto out_err_free_key2;
} }
ctx_id->internal_ctx_id = ctx;
dprintk("RPC: Successfully imported new context.\n");
return 0; return 0;
out_err_free_key2: out_err_free_key2:
@ -192,12 +183,36 @@ gss_import_sec_context_kerberos(const void *p,
crypto_free_blkcipher(ctx->enc); crypto_free_blkcipher(ctx->enc);
out_err_free_mech: out_err_free_mech:
kfree(ctx->mech_used.data); kfree(ctx->mech_used.data);
out_err_free_ctx:
kfree(ctx);
out_err: out_err:
return PTR_ERR(p); return PTR_ERR(p);
} }
static int
gss_import_sec_context_kerberos(const void *p, size_t len,
struct gss_ctx *ctx_id)
{
const void *end = (const void *)((const char *)p + len);
struct krb5_ctx *ctx;
int ret;
ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
if (ctx == NULL)
return -ENOMEM;
if (len == 85)
ret = gss_import_v1_context(p, end, ctx);
else
ret = -EINVAL;
if (ret == 0)
ctx_id->internal_ctx_id = ctx;
else
kfree(ctx);
dprintk("RPC: %s: returning %d\n", __func__, ret);
return ret;
}
static void static void
gss_delete_sec_context_kerberos(void *internal_ctx) { gss_delete_sec_context_kerberos(void *internal_ctx) {
struct krb5_ctx *kctx = internal_ctx; struct krb5_ctx *kctx = internal_ctx;