crypto: ccm - simplify error handling in crypto_rfc4309_create()

Simplify the error handling in crypto_rfc4309_create() by taking
advantage of crypto_grab_aead() now handling an ERR_PTR() name and by
taking advantage of crypto_drop_aead() now accepting (as a no-op) a
spawn that hasn't been grabbed yet.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/ccm.c b/crypto/ccm.c
index 241ecdc..d1fb01b 100644 (file)
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -717,7 +717,6 @@ static int crypto_rfc4309_create(struct crypto_template *tmpl,
        struct aead_instance *inst;
        struct crypto_aead_spawn *spawn;
        struct aead_alg *alg;
-       const char *ccm_name;
        int err;
 
        algt = crypto_get_attr_type(tb);
@@ -729,19 +728,15 @@ static int crypto_rfc4309_create(struct crypto_template *tmpl,
 
        mask = crypto_requires_sync(algt->type, algt->mask);
 
-       ccm_name = crypto_attr_alg_name(tb[1]);
-       if (IS_ERR(ccm_name))
-               return PTR_ERR(ccm_name);
-
        inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
        if (!inst)
                return -ENOMEM;
 
        spawn = aead_instance_ctx(inst);
        err = crypto_grab_aead(spawn, aead_crypto_instance(inst),
-                              ccm_name, 0, mask);
+                              crypto_attr_alg_name(tb[1]), 0, mask);
        if (err)
-               goto out_free_inst;
+               goto err_free_inst;
 
        alg = crypto_spawn_aead_alg(spawn);
 
@@ -749,11 +744,11 @@ static int crypto_rfc4309_create(struct crypto_template *tmpl,
 
        /* We only support 16-byte blocks. */
        if (crypto_aead_alg_ivsize(alg) != 16)
-               goto out_drop_alg;
+               goto err_free_inst;
 
        /* Not a stream cipher? */
        if (alg->base.cra_blocksize != 1)
-               goto out_drop_alg;
+               goto err_free_inst;
 
        err = -ENAMETOOLONG;
        if (snprintf(inst->alg.base.cra_name, CRYPTO_MAX_ALG_NAME,
@@ -762,7 +757,7 @@ static int crypto_rfc4309_create(struct crypto_template *tmpl,
            snprintf(inst->alg.base.cra_driver_name, CRYPTO_MAX_ALG_NAME,
                     "rfc4309(%s)", alg->base.cra_driver_name) >=
            CRYPTO_MAX_ALG_NAME)
-               goto out_drop_alg;
+               goto err_free_inst;
 
        inst->alg.base.cra_flags = alg->base.cra_flags & CRYPTO_ALG_ASYNC;
        inst->alg.base.cra_priority = alg->base.cra_priority;
@@ -786,17 +781,11 @@ static int crypto_rfc4309_create(struct crypto_template *tmpl,
        inst->free = crypto_rfc4309_free;
 
        err = aead_register_instance(tmpl, inst);
-       if (err)
-               goto out_drop_alg;
-
-out:
+       if (err) {
+err_free_inst:
+               crypto_rfc4309_free(inst);
+       }
        return err;
-
-out_drop_alg:
-       crypto_drop_aead(spawn);
-out_free_inst:
-       kfree(inst);
-       goto out;
 }
 
 static int crypto_cbcmac_digest_setkey(struct crypto_shash *parent,