Merge tag 'locking-core-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-jammy-kernel.git] / crypto / geniv.c

diff --git a/crypto/geniv.c b/crypto/geniv.c
index dbcc640274cda0f46d95f29360476385d2c5bbb0..bee4621b4f1251850b4fae7fba3760e0b35fcdf5 100644 (file)
--- a/crypto/geniv.c
+++ b/crypto/geniv.c
@@ -39,27 +39,19 @@ static void aead_geniv_free(struct aead_instance *inst)
 }
 
 struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
-                                      struct rtattr **tb, u32 type, u32 mask)
+                                      struct rtattr **tb)
 {
-       const char *name;
        struct crypto_aead_spawn *spawn;
-       struct crypto_attr_type *algt;
        struct aead_instance *inst;
        struct aead_alg *alg;
        unsigned int ivsize;
        unsigned int maxauthsize;
+       u32 mask;
        int err;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return ERR_CAST(algt);
-
-       if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
-               return ERR_PTR(-EINVAL);
-
-       name = crypto_attr_alg_name(tb[1]);
-       if (IS_ERR(name))
-               return ERR_CAST(name);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_AEAD, &mask);
+       if (err)
+               return ERR_PTR(err);
 
        inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
        if (!inst)
@@ -67,11 +59,8 @@ struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
 
        spawn = aead_instance_ctx(inst);
 
-       /* Ignore async algorithms if necessary. */
-       mask |= crypto_requires_sync(algt->type, algt->mask);
-
        err = crypto_grab_aead(spawn, aead_crypto_instance(inst),
-                              name, type, mask);
+                              crypto_attr_alg_name(tb[1]), 0, mask);
        if (err)
                goto err_free_inst;
 
@@ -82,19 +71,18 @@ struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
 
        err = -EINVAL;
        if (ivsize < sizeof(u64))
-               goto err_drop_alg;
+               goto err_free_inst;
 
        err = -ENAMETOOLONG;
        if (snprintf(inst->alg.base.cra_name, CRYPTO_MAX_ALG_NAME,
                     "%s(%s)", tmpl->name, alg->base.cra_name) >=
            CRYPTO_MAX_ALG_NAME)
-               goto err_drop_alg;
+               goto err_free_inst;
        if (snprintf(inst->alg.base.cra_driver_name, CRYPTO_MAX_ALG_NAME,
                     "%s(%s)", tmpl->name, alg->base.cra_driver_name) >=
            CRYPTO_MAX_ALG_NAME)
-               goto err_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;
        inst->alg.base.cra_blocksize = alg->base.cra_blocksize;
        inst->alg.base.cra_alignmask = alg->base.cra_alignmask;
@@ -111,10 +99,8 @@ struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
 out:
        return inst;
 
-err_drop_alg:
-       crypto_drop_aead(spawn);
 err_free_inst:
-       kfree(inst);
+       aead_geniv_free(inst);
        inst = ERR_PTR(err);
        goto out;
 }