crypto: algapi - use common mechanism for inheriting flags

The flag CRYPTO_ALG_ASYNC is "inherited" in the sense that when a
template is instantiated, the template will have CRYPTO_ALG_ASYNC set if
any of the algorithms it uses has CRYPTO_ALG_ASYNC set.

We'd like to add a second flag (CRYPTO_ALG_ALLOCATES_MEMORY) that gets
"inherited" in the same way.  This is difficult because the handling of
CRYPTO_ALG_ASYNC is hardcoded everywhere.  Address this by:

  - Add CRYPTO_ALG_INHERITED_FLAGS, which contains the set of flags that
    have these inheritance semantics.

  - Add crypto_algt_inherited_mask(), for use by template ->create()
    methods.  It returns any of these flags that the user asked to be
    unset and thus must be passed in the 'mask' to crypto_grab_*().

  - Also modify crypto_check_attr_type() to handle computing the 'mask'
    so that most templates can just use this.

  - Make crypto_grab_*() propagate these flags to the template instance
    being created so that templates don't have to do this themselves.

Make crypto/simd.c propagate these flags too, since it "wraps" another
algorithm, similar to a template.

Based on a patch by Mikulas Patocka <mpatocka@redhat.com>
(https://lore.kernel.org/r/alpine.LRH.2.02.2006301414580.30526@file01.intranet.prod.int.rdu2.redhat.com).

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

diff --git a/crypto/adiantum.c b/crypto/adiantum.c
index cf2b9f4103dd995c1ad544c05cde8293cdc24f7f..7fbdc327098422e0662cb7fb99d084dc44e5a32a 100644 (file)
--- a/crypto/adiantum.c
+++ b/crypto/adiantum.c
@@ -490,7 +490,6 @@ static bool adiantum_supported_algorithms(struct skcipher_alg *streamcipher_alg,
 
 static int adiantum_create(struct crypto_template *tmpl, struct rtattr **tb)
 {
-       struct crypto_attr_type *algt;
        u32 mask;
        const char *nhpoly1305_name;
        struct skcipher_instance *inst;
@@ -500,14 +499,9 @@ static int adiantum_create(struct crypto_template *tmpl, struct rtattr **tb)
        struct shash_alg *hash_alg;
        int err;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return PTR_ERR(algt);
-
-       if ((algt->type ^ CRYPTO_ALG_TYPE_SKCIPHER) & algt->mask)
-               return -EINVAL;
-
-       mask = crypto_requires_sync(algt->type, algt->mask);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SKCIPHER, &mask);
+       if (err)
+               return err;
 
        inst = kzalloc(sizeof(*inst) + sizeof(*ictx), GFP_KERNEL);
        if (!inst)
@@ -565,8 +559,6 @@ static int adiantum_create(struct crypto_template *tmpl, struct rtattr **tb)
                     hash_alg->base.cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
                goto err_free_inst;
 
-       inst->alg.base.cra_flags = streamcipher_alg->base.cra_flags &
-                                  CRYPTO_ALG_ASYNC;
        inst->alg.base.cra_blocksize = BLOCKCIPHER_BLOCK_SIZE;
        inst->alg.base.cra_ctxsize = sizeof(struct adiantum_tfm_ctx);
        inst->alg.base.cra_alignmask = streamcipher_alg->base.cra_alignmask |

diff --git a/crypto/algapi.c b/crypto/algapi.c
index 92abdf675992c681ce5206a8c5783fc88495caa8..fdabf2675b63fefed7e93ad994e35e7f7b3844d5 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -690,6 +690,8 @@ int crypto_grab_spawn(struct crypto_spawn *spawn, struct crypto_instance *inst,
                spawn->mask = mask;
                spawn->next = inst->spawns;
                inst->spawns = spawn;
+               inst->alg.cra_flags |=
+                       (alg->cra_flags & CRYPTO_ALG_INHERITED_FLAGS);
                err = 0;
        }
        up_write(&crypto_alg_sem);
@@ -816,7 +818,23 @@ struct crypto_attr_type *crypto_get_attr_type(struct rtattr **tb)
 }
 EXPORT_SYMBOL_GPL(crypto_get_attr_type);
 
-int crypto_check_attr_type(struct rtattr **tb, u32 type)
+/**
+ * crypto_check_attr_type() - check algorithm type and compute inherited mask
+ * @tb: the template parameters
+ * @type: the algorithm type the template would be instantiated as
+ * @mask_ret: (output) the mask that should be passed to crypto_grab_*()
+ *           to restrict the flags of any inner algorithms
+ *
+ * Validate that the algorithm type the user requested is compatible with the
+ * one the template would actually be instantiated as.  E.g., if the user is
+ * doing crypto_alloc_shash("cbc(aes)", ...), this would return an error because
+ * the "cbc" template creates an "skcipher" algorithm, not an "shash" algorithm.
+ *
+ * Also compute the mask to use to restrict the flags of any inner algorithms.
+ *
+ * Return: 0 on success; -errno on failure
+ */
+int crypto_check_attr_type(struct rtattr **tb, u32 type, u32 *mask_ret)
 {
        struct crypto_attr_type *algt;
 
@@ -827,6 +845,7 @@ int crypto_check_attr_type(struct rtattr **tb, u32 type)
        if ((algt->type ^ type) & algt->mask)
                return -EINVAL;
 
+       *mask_ret = crypto_algt_inherited_mask(algt);
        return 0;
 }
 EXPORT_SYMBOL_GPL(crypto_check_attr_type);

diff --git a/crypto/authenc.c b/crypto/authenc.c
index 775e7138fd10c4abe5abd24a589ac01ccfc0ca2b..670bf1a01d00e4c3fd1cda495973a78da9ae6db2 100644 (file)
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -372,7 +372,6 @@ static void crypto_authenc_free(struct aead_instance *inst)
 static int crypto_authenc_create(struct crypto_template *tmpl,
                                 struct rtattr **tb)
 {
-       struct crypto_attr_type *algt;
        u32 mask;
        struct aead_instance *inst;
        struct authenc_instance_ctx *ctx;
@@ -381,14 +380,9 @@ static int crypto_authenc_create(struct crypto_template *tmpl,
        struct skcipher_alg *enc;
        int err;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return PTR_ERR(algt);
-
-       if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
-               return -EINVAL;
-
-       mask = crypto_requires_sync(algt->type, algt->mask);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_AEAD, &mask);
+       if (err)
+               return err;
 
        inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
        if (!inst)
@@ -423,8 +417,6 @@ static int crypto_authenc_create(struct crypto_template *tmpl,
                     enc->base.cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
                goto err_free_inst;
 
-       inst->alg.base.cra_flags = (auth_base->cra_flags |
-                                   enc->base.cra_flags) & CRYPTO_ALG_ASYNC;
        inst->alg.base.cra_priority = enc->base.cra_priority * 10 +
                                      auth_base->cra_priority;
        inst->alg.base.cra_blocksize = enc->base.cra_blocksize;

diff --git a/crypto/authencesn.c b/crypto/authencesn.c
index 149b70df2a91712fe00c25ddfe6a66779261d576..b60e61b1904cb1f91bacc4902c2a0d976ed4107d 100644 (file)
--- a/crypto/authencesn.c
+++ b/crypto/authencesn.c
@@ -390,7 +390,6 @@ static void crypto_authenc_esn_free(struct aead_instance *inst)
 static int crypto_authenc_esn_create(struct crypto_template *tmpl,
                                     struct rtattr **tb)
 {
-       struct crypto_attr_type *algt;
        u32 mask;
        struct aead_instance *inst;
        struct authenc_esn_instance_ctx *ctx;
@@ -399,14 +398,9 @@ static int crypto_authenc_esn_create(struct crypto_template *tmpl,
        struct skcipher_alg *enc;
        int err;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return PTR_ERR(algt);
-
-       if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
-               return -EINVAL;
-
-       mask = crypto_requires_sync(algt->type, algt->mask);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_AEAD, &mask);
+       if (err)
+               return err;
 
        inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
        if (!inst)
@@ -437,8 +431,6 @@ static int crypto_authenc_esn_create(struct crypto_template *tmpl,
                     enc->base.cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
                goto err_free_inst;
 
-       inst->alg.base.cra_flags = (auth_base->cra_flags |
-                                   enc->base.cra_flags) & CRYPTO_ALG_ASYNC;
        inst->alg.base.cra_priority = enc->base.cra_priority * 10 +
                                      auth_base->cra_priority;
        inst->alg.base.cra_blocksize = enc->base.cra_blocksize;

diff --git a/crypto/ccm.c b/crypto/ccm.c
index d1fb01bbc81431779c0cf90c937545bf235d464b..494d7090118625054850442196ee484dbfa658e6 100644 (file)
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -447,7 +447,6 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,
                                    const char *ctr_name,
                                    const char *mac_name)
 {
-       struct crypto_attr_type *algt;
        u32 mask;
        struct aead_instance *inst;
        struct ccm_instance_ctx *ictx;
@@ -455,14 +454,9 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,
        struct hash_alg_common *mac;
        int err;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return PTR_ERR(algt);
-
-       if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
-               return -EINVAL;
-
-       mask = crypto_requires_sync(algt->type, algt->mask);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_AEAD, &mask);
+       if (err)
+               return err;
 
        inst = kzalloc(sizeof(*inst) + sizeof(*ictx), GFP_KERNEL);
        if (!inst)
@@ -470,7 +464,7 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,
        ictx = aead_instance_ctx(inst);
 
        err = crypto_grab_ahash(&ictx->mac, aead_crypto_instance(inst),
-                               mac_name, 0, CRYPTO_ALG_ASYNC);
+                               mac_name, 0, mask | CRYPTO_ALG_ASYNC);
        if (err)
                goto err_free_inst;
        mac = crypto_spawn_ahash_alg(&ictx->mac);
@@ -507,7 +501,6 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,
                     mac->base.cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
                goto err_free_inst;
 
-       inst->alg.base.cra_flags = ctr->base.cra_flags & CRYPTO_ALG_ASYNC;
        inst->alg.base.cra_priority = (mac->base.cra_priority +
                                       ctr->base.cra_priority) / 2;
        inst->alg.base.cra_blocksize = 1;
@@ -712,21 +705,15 @@ static void crypto_rfc4309_free(struct aead_instance *inst)
 static int crypto_rfc4309_create(struct crypto_template *tmpl,
                                 struct rtattr **tb)
 {
-       struct crypto_attr_type *algt;
        u32 mask;
        struct aead_instance *inst;
        struct crypto_aead_spawn *spawn;
        struct aead_alg *alg;
        int err;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return PTR_ERR(algt);
-
-       if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
-               return -EINVAL;
-
-       mask = crypto_requires_sync(algt->type, algt->mask);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_AEAD, &mask);
+       if (err)
+               return err;
 
        inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
        if (!inst)
@@ -759,7 +746,6 @@ static int crypto_rfc4309_create(struct crypto_template *tmpl,
            CRYPTO_MAX_ALG_NAME)
                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 = 1;
        inst->alg.base.cra_alignmask = alg->base.cra_alignmask;
@@ -878,9 +864,10 @@ static int cbcmac_create(struct crypto_template *tmpl, struct rtattr **tb)
        struct shash_instance *inst;
        struct crypto_cipher_spawn *spawn;
        struct crypto_alg *alg;
+       u32 mask;
        int err;
 
-       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SHASH);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SHASH, &mask);
        if (err)
                return err;
 
@@ -890,7 +877,7 @@ static int cbcmac_create(struct crypto_template *tmpl, struct rtattr **tb)
        spawn = shash_instance_ctx(inst);
 
        err = crypto_grab_cipher(spawn, shash_crypto_instance(inst),
-                                crypto_attr_alg_name(tb[1]), 0, 0);
+                                crypto_attr_alg_name(tb[1]), 0, mask);
        if (err)
                goto err_free_inst;
        alg = crypto_spawn_cipher_alg(spawn);

diff --git a/crypto/chacha20poly1305.c b/crypto/chacha20poly1305.c
index ccaea5cb66d1d61505506933d290b2c774bb986e..97bbb135e9a6d9a28c671ccf6434aa730ec6465b 100644 (file)
--- a/crypto/chacha20poly1305.c
+++ b/crypto/chacha20poly1305.c
@@ -555,7 +555,6 @@ static void chachapoly_free(struct aead_instance *inst)
 static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb,
                             const char *name, unsigned int ivsize)
 {
-       struct crypto_attr_type *algt;
        u32 mask;
        struct aead_instance *inst;
        struct chachapoly_instance_ctx *ctx;
@@ -566,14 +565,9 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb,
        if (ivsize > CHACHAPOLY_IV_SIZE)
                return -EINVAL;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return PTR_ERR(algt);
-
-       if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
-               return -EINVAL;
-
-       mask = crypto_requires_sync(algt->type, algt->mask);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_AEAD, &mask);
+       if (err)
+               return err;
 
        inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
        if (!inst)
@@ -613,8 +607,6 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb,
                     poly->base.cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
                goto err_free_inst;
 
-       inst->alg.base.cra_flags = (chacha->base.cra_flags |
-                                   poly->base.cra_flags) & CRYPTO_ALG_ASYNC;
        inst->alg.base.cra_priority = (chacha->base.cra_priority +
                                       poly->base.cra_priority) / 2;
        inst->alg.base.cra_blocksize = 1;

diff --git a/crypto/cmac.c b/crypto/cmac.c
index 143a6544c873f53b4803091cec4502fc630fd1a8..df36be1efb81739d5618861533b85cd74acb508b 100644 (file)
--- a/crypto/cmac.c
+++ b/crypto/cmac.c
@@ -225,9 +225,10 @@ static int cmac_create(struct crypto_template *tmpl, struct rtattr **tb)
        struct crypto_cipher_spawn *spawn;
        struct crypto_alg *alg;
        unsigned long alignmask;
+       u32 mask;
        int err;
 
-       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SHASH);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SHASH, &mask);
        if (err)
                return err;
 
@@ -237,7 +238,7 @@ static int cmac_create(struct crypto_template *tmpl, struct rtattr **tb)
        spawn = shash_instance_ctx(inst);
 
        err = crypto_grab_cipher(spawn, shash_crypto_instance(inst),
-                                crypto_attr_alg_name(tb[1]), 0, 0);
+                                crypto_attr_alg_name(tb[1]), 0, mask);
        if (err)
                goto err_free_inst;
        alg = crypto_spawn_cipher_alg(spawn);

diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index 283212262adbbda5eeb83a6c040ebadbab2da3cd..a1bea0f4baa881b73422618669634b77abe1f68c 100644 (file)
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -191,17 +191,20 @@ static inline struct cryptd_queue *cryptd_get_queue(struct crypto_tfm *tfm)
        return ictx->queue;
 }
 
-static inline void cryptd_check_internal(struct rtattr **tb, u32 *type,
-                                        u32 *mask)
+static void cryptd_type_and_mask(struct crypto_attr_type *algt,
+                                u32 *type, u32 *mask)
 {
-       struct crypto_attr_type *algt;
+       /*
+        * cryptd is allowed to wrap internal algorithms, but in that case the
+        * resulting cryptd instance will be marked as internal as well.
+        */
+       *type = algt->type & CRYPTO_ALG_INTERNAL;
+       *mask = algt->mask & CRYPTO_ALG_INTERNAL;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return;
+       /* No point in cryptd wrapping an algorithm that's already async. */
+       *mask |= CRYPTO_ALG_ASYNC;
 
-       *type |= algt->type & CRYPTO_ALG_INTERNAL;
-       *mask |= algt->mask & CRYPTO_ALG_INTERNAL;
+       *mask |= crypto_algt_inherited_mask(algt);
 }
 
 static int cryptd_init_instance(struct crypto_instance *inst,
@@ -364,6 +367,7 @@ static void cryptd_skcipher_free(struct skcipher_instance *inst)
 
 static int cryptd_create_skcipher(struct crypto_template *tmpl,
                                  struct rtattr **tb,
+                                 struct crypto_attr_type *algt,
                                  struct cryptd_queue *queue)
 {
        struct skcipherd_instance_ctx *ctx;
@@ -373,10 +377,7 @@ static int cryptd_create_skcipher(struct crypto_template *tmpl,
        u32 mask;
        int err;
 
-       type = 0;
-       mask = CRYPTO_ALG_ASYNC;
-
-       cryptd_check_internal(tb, &type, &mask);
+       cryptd_type_and_mask(algt, &type, &mask);
 
        inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
        if (!inst)
@@ -395,9 +396,8 @@ static int cryptd_create_skcipher(struct crypto_template *tmpl,
        if (err)
                goto err_free_inst;
 
-       inst->alg.base.cra_flags = CRYPTO_ALG_ASYNC |
-                                  (alg->base.cra_flags & CRYPTO_ALG_INTERNAL);
-
+       inst->alg.base.cra_flags |= CRYPTO_ALG_ASYNC |
+               (alg->base.cra_flags & CRYPTO_ALG_INTERNAL);
        inst->alg.ivsize = crypto_skcipher_alg_ivsize(alg);
        inst->alg.chunksize = crypto_skcipher_alg_chunksize(alg);
        inst->alg.min_keysize = crypto_skcipher_alg_min_keysize(alg);
@@ -633,16 +633,17 @@ static void cryptd_hash_free(struct ahash_instance *inst)
 }
 
 static int cryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb,
+                             struct crypto_attr_type *algt,
                              struct cryptd_queue *queue)
 {
        struct hashd_instance_ctx *ctx;
        struct ahash_instance *inst;
        struct shash_alg *alg;
-       u32 type = 0;
-       u32 mask = 0;
+       u32 type;
+       u32 mask;
        int err;
 
-       cryptd_check_internal(tb, &type, &mask);
+       cryptd_type_and_mask(algt, &type, &mask);
 
        inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
        if (!inst)
@@ -661,10 +662,9 @@ static int cryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb,
        if (err)
                goto err_free_inst;
 
-       inst->alg.halg.base.cra_flags = CRYPTO_ALG_ASYNC |
-               (alg->base.cra_flags & (CRYPTO_ALG_INTERNAL |
+       inst->alg.halg.base.cra_flags |= CRYPTO_ALG_ASYNC |
+               (alg->base.cra_flags & (CRYPTO_ALG_INTERNAL|
                                        CRYPTO_ALG_OPTIONAL_KEY));
-
        inst->alg.halg.digestsize = alg->digestsize;
        inst->alg.halg.statesize = alg->statesize;
        inst->alg.halg.base.cra_ctxsize = sizeof(struct cryptd_hash_ctx);
@@ -820,16 +820,17 @@ static void cryptd_aead_free(struct aead_instance *inst)
 
 static int cryptd_create_aead(struct crypto_template *tmpl,
                              struct rtattr **tb,
+                             struct crypto_attr_type *algt,
                              struct cryptd_queue *queue)
 {
        struct aead_instance_ctx *ctx;
        struct aead_instance *inst;
        struct aead_alg *alg;
-       u32 type = 0;
-       u32 mask = CRYPTO_ALG_ASYNC;
+       u32 type;
+       u32 mask;
        int err;
 
-       cryptd_check_internal(tb, &type, &mask);
+       cryptd_type_and_mask(algt, &type, &mask);
 
        inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
        if (!inst)
@@ -848,8 +849,8 @@ static int cryptd_create_aead(struct crypto_template *tmpl,
        if (err)
                goto err_free_inst;
 
-       inst->alg.base.cra_flags = CRYPTO_ALG_ASYNC |
-                                  (alg->base.cra_flags & CRYPTO_ALG_INTERNAL);
+       inst->alg.base.cra_flags |= CRYPTO_ALG_ASYNC |
+               (alg->base.cra_flags & CRYPTO_ALG_INTERNAL);
        inst->alg.base.cra_ctxsize = sizeof(struct cryptd_aead_ctx);
 
        inst->alg.ivsize = crypto_aead_alg_ivsize(alg);
@@ -884,11 +885,11 @@ static int cryptd_create(struct crypto_template *tmpl, struct rtattr **tb)
 
        switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) {
        case CRYPTO_ALG_TYPE_SKCIPHER:
-               return cryptd_create_skcipher(tmpl, tb, &queue);
+               return cryptd_create_skcipher(tmpl, tb, algt, &queue);
        case CRYPTO_ALG_TYPE_HASH:
-               return cryptd_create_hash(tmpl, tb, &queue);
+               return cryptd_create_hash(tmpl, tb, algt, &queue);
        case CRYPTO_ALG_TYPE_AEAD:
-               return cryptd_create_aead(tmpl, tb, &queue);
+               return cryptd_create_aead(tmpl, tb, algt, &queue);
        }
 
        return -EINVAL;

diff --git a/crypto/ctr.c b/crypto/ctr.c
index 31ac4ae598e170172fe442053b3118fa00e9177b..ae8d88c715d6cdbfbfdbc9df748c1befc86540d9 100644 (file)
--- a/crypto/ctr.c
+++ b/crypto/ctr.c
@@ -256,29 +256,22 @@ static void crypto_rfc3686_free(struct skcipher_instance *inst)
 static int crypto_rfc3686_create(struct crypto_template *tmpl,
                                 struct rtattr **tb)
 {
-       struct crypto_attr_type *algt;
        struct skcipher_instance *inst;
        struct skcipher_alg *alg;
        struct crypto_skcipher_spawn *spawn;
        u32 mask;
-
        int err;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return PTR_ERR(algt);
-
-       if ((algt->type ^ CRYPTO_ALG_TYPE_SKCIPHER) & algt->mask)
-               return -EINVAL;
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SKCIPHER, &mask);
+       if (err)
+               return err;
+       mask |= crypto_requires_off(crypto_get_attr_type(tb),
+                                   CRYPTO_ALG_NEED_FALLBACK);
 
        inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
        if (!inst)
                return -ENOMEM;
 
-       mask = crypto_requires_sync(algt->type, algt->mask) |
-               crypto_requires_off(algt->type, algt->mask,
-                                   CRYPTO_ALG_NEED_FALLBACK);
-
        spawn = skcipher_instance_ctx(inst);
 
        err = crypto_grab_skcipher(spawn, skcipher_crypto_instance(inst),
@@ -310,8 +303,6 @@ static int crypto_rfc3686_create(struct crypto_template *tmpl,
        inst->alg.base.cra_blocksize = 1;
        inst->alg.base.cra_alignmask = alg->base.cra_alignmask;
 
-       inst->alg.base.cra_flags = alg->base.cra_flags & CRYPTO_ALG_ASYNC;
-
        inst->alg.ivsize = CTR_RFC3686_IV_SIZE;
        inst->alg.chunksize = crypto_skcipher_alg_chunksize(alg);
        inst->alg.min_keysize = crypto_skcipher_alg_min_keysize(alg) +

diff --git a/crypto/cts.c b/crypto/cts.c
index 5e005c4f0221589ddf19e3cd40def39f7ac3a22f..3766d47ebcc01933d76f2cfef87393e64e7ce42f 100644 (file)
--- a/crypto/cts.c
+++ b/crypto/cts.c
@@ -325,19 +325,13 @@ static int crypto_cts_create(struct crypto_template *tmpl, struct rtattr **tb)
 {
        struct crypto_skcipher_spawn *spawn;
        struct skcipher_instance *inst;
-       struct crypto_attr_type *algt;
        struct skcipher_alg *alg;
        u32 mask;
        int err;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return PTR_ERR(algt);
-
-       if ((algt->type ^ CRYPTO_ALG_TYPE_SKCIPHER) & algt->mask)
-               return -EINVAL;
-
-       mask = crypto_requires_sync(algt->type, algt->mask);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SKCIPHER, &mask);
+       if (err)
+               return err;
 
        inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
        if (!inst)
@@ -364,7 +358,6 @@ static int crypto_cts_create(struct crypto_template *tmpl, struct rtattr **tb)
        if (err)
                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;

diff --git a/crypto/essiv.c b/crypto/essiv.c
index a7f45dbc4ee2893d567ea3f13aa0c61874e10b7d..d012be23d496d09f7157ee68d8541d35a89e3f7d 100644 (file)
--- a/crypto/essiv.c
+++ b/crypto/essiv.c
@@ -466,7 +466,7 @@ static int essiv_create(struct crypto_template *tmpl, struct rtattr **tb)
                return PTR_ERR(shash_name);
 
        type = algt->type & algt->mask;
-       mask = crypto_requires_sync(algt->type, algt->mask);
+       mask = crypto_algt_inherited_mask(algt);
 
        switch (type) {
        case CRYPTO_ALG_TYPE_SKCIPHER:
@@ -525,7 +525,7 @@ static int essiv_create(struct crypto_template *tmpl, struct rtattr **tb)
        /* Synchronous hash, e.g., "sha256" */
        _hash_alg = crypto_alg_mod_lookup(shash_name,
                                          CRYPTO_ALG_TYPE_SHASH,
-                                         CRYPTO_ALG_TYPE_MASK);
+                                         CRYPTO_ALG_TYPE_MASK | mask);
        if (IS_ERR(_hash_alg)) {
                err = PTR_ERR(_hash_alg);
                goto out_drop_skcipher;
@@ -557,7 +557,12 @@ static int essiv_create(struct crypto_template *tmpl, struct rtattr **tb)
                     hash_alg->base.cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
                goto out_free_hash;
 
-       base->cra_flags         = block_base->cra_flags & CRYPTO_ALG_ASYNC;
+       /*
+        * hash_alg wasn't gotten via crypto_grab*(), so we need to inherit its
+        * flags manually.
+        */
+       base->cra_flags        |= (hash_alg->base.cra_flags &
+                                  CRYPTO_ALG_INHERITED_FLAGS);
        base->cra_blocksize     = block_base->cra_blocksize;
        base->cra_ctxsize       = sizeof(struct essiv_tfm_ctx);
        base->cra_alignmask     = block_base->cra_alignmask;

diff --git a/crypto/gcm.c b/crypto/gcm.c
index 0103d28c541eb4137240c45fa74be7bde2638fb8..3a36a9533c96ea11193914ba0a90b64d1fbb34cb 100644 (file)
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -578,7 +578,6 @@ static int crypto_gcm_create_common(struct crypto_template *tmpl,
                                    const char *ctr_name,
                                    const char *ghash_name)
 {
-       struct crypto_attr_type *algt;
        u32 mask;
        struct aead_instance *inst;
        struct gcm_instance_ctx *ctx;
@@ -586,14 +585,9 @@ static int crypto_gcm_create_common(struct crypto_template *tmpl,
        struct hash_alg_common *ghash;
        int err;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return PTR_ERR(algt);
-
-       if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
-               return -EINVAL;
-
-       mask = crypto_requires_sync(algt->type, algt->mask);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_AEAD, &mask);
+       if (err)
+               return err;
 
        inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
        if (!inst)
@@ -635,8 +629,6 @@ static int crypto_gcm_create_common(struct crypto_template *tmpl,
            CRYPTO_MAX_ALG_NAME)
                goto err_free_inst;
 
-       inst->alg.base.cra_flags = (ghash->base.cra_flags |
-                                   ctr->base.cra_flags) & CRYPTO_ALG_ASYNC;
        inst->alg.base.cra_priority = (ghash->base.cra_priority +
                                       ctr->base.cra_priority) / 2;
        inst->alg.base.cra_blocksize = 1;
@@ -835,21 +827,15 @@ static void crypto_rfc4106_free(struct aead_instance *inst)
 static int crypto_rfc4106_create(struct crypto_template *tmpl,
                                 struct rtattr **tb)
 {
-       struct crypto_attr_type *algt;
        u32 mask;
        struct aead_instance *inst;
        struct crypto_aead_spawn *spawn;
        struct aead_alg *alg;
        int err;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return PTR_ERR(algt);
-
-       if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
-               return -EINVAL;
-
-       mask = crypto_requires_sync(algt->type, algt->mask);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_AEAD, &mask);
+       if (err)
+               return err;
 
        inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
        if (!inst)
@@ -882,7 +868,6 @@ static int crypto_rfc4106_create(struct crypto_template *tmpl,
            CRYPTO_MAX_ALG_NAME)
                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 = 1;
        inst->alg.base.cra_alignmask = alg->base.cra_alignmask;
@@ -1057,21 +1042,15 @@ static void crypto_rfc4543_free(struct aead_instance *inst)
 static int crypto_rfc4543_create(struct crypto_template *tmpl,
                                struct rtattr **tb)
 {
-       struct crypto_attr_type *algt;
        u32 mask;
        struct aead_instance *inst;
        struct aead_alg *alg;
        struct crypto_rfc4543_instance_ctx *ctx;
        int err;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return PTR_ERR(algt);
-
-       if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
-               return -EINVAL;
-
-       mask = crypto_requires_sync(algt->type, algt->mask);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_AEAD, &mask);
+       if (err)
+               return err;
 
        inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
        if (!inst)
@@ -1104,7 +1083,6 @@ static int crypto_rfc4543_create(struct crypto_template *tmpl,
            CRYPTO_MAX_ALG_NAME)
                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 = 1;
        inst->alg.base.cra_alignmask = alg->base.cra_alignmask;

diff --git a/crypto/geniv.c b/crypto/geniv.c
index 07496c8af0abd5a31f4b50ffb179e28bacebb7ad..bee4621b4f1251850b4fae7fba3760e0b35fcdf5 100644 (file)
--- a/crypto/geniv.c
+++ b/crypto/geniv.c
@@ -42,7 +42,6 @@ struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
                                       struct rtattr **tb)
 {
        struct crypto_aead_spawn *spawn;
-       struct crypto_attr_type *algt;
        struct aead_instance *inst;
        struct aead_alg *alg;
        unsigned int ivsize;
@@ -50,12 +49,9 @@ struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
        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);
+       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)
@@ -63,9 +59,6 @@ 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),
                               crypto_attr_alg_name(tb[1]), 0, mask);
        if (err)
@@ -90,7 +83,6 @@ struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
            CRYPTO_MAX_ALG_NAME)
                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;

diff --git a/crypto/hmac.c b/crypto/hmac.c
index e38bfb948278458bdd11d983d0424b03f4a362b5..25856aa7ccbf9af9eac3204727081a6f56d07559 100644 (file)
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
@@ -168,11 +168,12 @@ static int hmac_create(struct crypto_template *tmpl, struct rtattr **tb)
        struct crypto_shash_spawn *spawn;
        struct crypto_alg *alg;
        struct shash_alg *salg;
+       u32 mask;
        int err;
        int ds;
        int ss;
 
-       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SHASH);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SHASH, &mask);
        if (err)
                return err;
 
@@ -182,7 +183,7 @@ static int hmac_create(struct crypto_template *tmpl, struct rtattr **tb)
        spawn = shash_instance_ctx(inst);
 
        err = crypto_grab_shash(spawn, shash_crypto_instance(inst),
-                               crypto_attr_alg_name(tb[1]), 0, 0);
+                               crypto_attr_alg_name(tb[1]), 0, mask);
        if (err)
                goto err_free_inst;
        salg = crypto_spawn_shash_alg(spawn);

diff --git a/crypto/lrw.c b/crypto/lrw.c
index 5b07a7c09296690a7195822acaaaa332d69ca430..a709c801ee45b5065171a3f1e8d26503d382faa0 100644 (file)
--- a/crypto/lrw.c
+++ b/crypto/lrw.c
@@ -297,21 +297,15 @@ static int create(struct crypto_template *tmpl, struct rtattr **tb)
 {
        struct crypto_skcipher_spawn *spawn;
        struct skcipher_instance *inst;
-       struct crypto_attr_type *algt;
        struct skcipher_alg *alg;
        const char *cipher_name;
        char ecb_name[CRYPTO_MAX_ALG_NAME];
        u32 mask;
        int err;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return PTR_ERR(algt);
-
-       if ((algt->type ^ CRYPTO_ALG_TYPE_SKCIPHER) & algt->mask)
-               return -EINVAL;
-
-       mask = crypto_requires_sync(algt->type, algt->mask);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SKCIPHER, &mask);
+       if (err)
+               return err;
 
        cipher_name = crypto_attr_alg_name(tb[1]);
        if (IS_ERR(cipher_name))
@@ -379,7 +373,6 @@ static int create(struct crypto_template *tmpl, struct rtattr **tb)
        } else
                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 = LRW_BLOCK_SIZE;
        inst->alg.base.cra_alignmask = alg->base.cra_alignmask |

diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
index 8bddc65cd50922a00fe070c37b4f88ce4cada062..cbc383a1a3fefd34e3072b72481d49635d86f740 100644 (file)
--- a/crypto/pcrypt.c
+++ b/crypto/pcrypt.c
@@ -226,18 +226,14 @@ static int pcrypt_init_instance(struct crypto_instance *inst,
 }
 
 static int pcrypt_create_aead(struct crypto_template *tmpl, struct rtattr **tb,
-                             u32 type, u32 mask)
+                             struct crypto_attr_type *algt)
 {
        struct pcrypt_instance_ctx *ctx;
-       struct crypto_attr_type *algt;
        struct aead_instance *inst;
        struct aead_alg *alg;
+       u32 mask = crypto_algt_inherited_mask(algt);
        int err;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return PTR_ERR(algt);
-
        inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
        if (!inst)
                return -ENOMEM;
@@ -254,7 +250,7 @@ static int pcrypt_create_aead(struct crypto_template *tmpl, struct rtattr **tb,
                goto err_free_inst;
 
        err = crypto_grab_aead(&ctx->spawn, aead_crypto_instance(inst),
-                              crypto_attr_alg_name(tb[1]), 0, 0);
+                              crypto_attr_alg_name(tb[1]), 0, mask);
        if (err)
                goto err_free_inst;
 
@@ -263,7 +259,7 @@ static int pcrypt_create_aead(struct crypto_template *tmpl, struct rtattr **tb,
        if (err)
                goto err_free_inst;
 
-       inst->alg.base.cra_flags = CRYPTO_ALG_ASYNC;
+       inst->alg.base.cra_flags |= CRYPTO_ALG_ASYNC;
 
        inst->alg.ivsize = crypto_aead_alg_ivsize(alg);
        inst->alg.maxauthsize = crypto_aead_alg_maxauthsize(alg);
@@ -298,7 +294,7 @@ static int pcrypt_create(struct crypto_template *tmpl, struct rtattr **tb)
 
        switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) {
        case CRYPTO_ALG_TYPE_AEAD:
-               return pcrypt_create_aead(tmpl, tb, algt->type, algt->mask);
+               return pcrypt_create_aead(tmpl, tb, algt);
        }
 
        return -EINVAL;

diff --git a/crypto/rsa-pkcs1pad.c b/crypto/rsa-pkcs1pad.c
index d31031de51bcb78438996bdda45cb8ae8ffcf0ce..4983b2b4a223509be3230e7b2028bb6c6a258f50 100644 (file)
--- a/crypto/rsa-pkcs1pad.c
+++ b/crypto/rsa-pkcs1pad.c
@@ -596,7 +596,6 @@ static void pkcs1pad_free(struct akcipher_instance *inst)
 
 static int pkcs1pad_create(struct crypto_template *tmpl, struct rtattr **tb)
 {
-       struct crypto_attr_type *algt;
        u32 mask;
        struct akcipher_instance *inst;
        struct pkcs1pad_inst_ctx *ctx;
@@ -604,14 +603,9 @@ static int pkcs1pad_create(struct crypto_template *tmpl, struct rtattr **tb)
        const char *hash_name;
        int err;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return PTR_ERR(algt);
-
-       if ((algt->type ^ CRYPTO_ALG_TYPE_AKCIPHER) & algt->mask)
-               return -EINVAL;
-
-       mask = crypto_requires_sync(algt->type, algt->mask);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_AKCIPHER, &mask);
+       if (err)
+               return err;
 
        inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
        if (!inst)
@@ -658,7 +652,6 @@ static int pkcs1pad_create(struct crypto_template *tmpl, struct rtattr **tb)
                        goto err_free_inst;
        }
 
-       inst->alg.base.cra_flags = rsa_alg->base.cra_flags & CRYPTO_ALG_ASYNC;
        inst->alg.base.cra_priority = rsa_alg->base.cra_priority;
        inst->alg.base.cra_ctxsize = sizeof(struct pkcs1pad_ctx);
 

diff --git a/crypto/simd.c b/crypto/simd.c
index 56885af49c24ca118b1fd79d51c11be2d8d991aa..edaa479a1ec5e5027884c9826d3012067db4da5f 100644 (file)
--- a/crypto/simd.c
+++ b/crypto/simd.c
@@ -171,7 +171,8 @@ struct simd_skcipher_alg *simd_skcipher_create_compat(const char *algname,
                     drvname) >= CRYPTO_MAX_ALG_NAME)
                goto out_free_salg;
 
-       alg->base.cra_flags = CRYPTO_ALG_ASYNC;
+       alg->base.cra_flags = CRYPTO_ALG_ASYNC |
+               (ialg->base.cra_flags & CRYPTO_ALG_INHERITED_FLAGS);
        alg->base.cra_priority = ialg->base.cra_priority;
        alg->base.cra_blocksize = ialg->base.cra_blocksize;
        alg->base.cra_alignmask = ialg->base.cra_alignmask;
@@ -417,7 +418,8 @@ struct simd_aead_alg *simd_aead_create_compat(const char *algname,
                     drvname) >= CRYPTO_MAX_ALG_NAME)
                goto out_free_salg;
 
-       alg->base.cra_flags = CRYPTO_ALG_ASYNC;
+       alg->base.cra_flags = CRYPTO_ALG_ASYNC |
+               (ialg->base.cra_flags & CRYPTO_ALG_INHERITED_FLAGS);
        alg->base.cra_priority = ialg->base.cra_priority;
        alg->base.cra_blocksize = ialg->base.cra_blocksize;
        alg->base.cra_alignmask = ialg->base.cra_alignmask;

diff --git a/crypto/skcipher.c b/crypto/skcipher.c
index 7221def7b9a7ff4bd2b3a96d53b162cd8d10d5bf..3b93a74ad124b5b92e9299135516015ed042545f 100644 (file)
--- a/crypto/skcipher.c
+++ b/crypto/skcipher.c
@@ -934,22 +934,17 @@ static void skcipher_free_instance_simple(struct skcipher_instance *inst)
 struct skcipher_instance *skcipher_alloc_instance_simple(
        struct crypto_template *tmpl, struct rtattr **tb)
 {
-       struct crypto_attr_type *algt;
        u32 mask;
        struct skcipher_instance *inst;
        struct crypto_cipher_spawn *spawn;
        struct crypto_alg *cipher_alg;
        int err;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return ERR_CAST(algt);
-
-       if ((algt->type ^ CRYPTO_ALG_TYPE_SKCIPHER) & algt->mask)
-               return ERR_PTR(-EINVAL);
-
-       mask = crypto_requires_off(algt->type, algt->mask,
-                                  CRYPTO_ALG_NEED_FALLBACK);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SKCIPHER, &mask);
+       if (err)
+               return ERR_PTR(err);
+       mask |= crypto_requires_off(crypto_get_attr_type(tb),
+                                   CRYPTO_ALG_NEED_FALLBACK);
 
        inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
        if (!inst)

diff --git a/crypto/vmac.c b/crypto/vmac.c
index 2d906830df96df633fb09a22169dd80d68fa704f..9b565d1040d65bb8d4b5277f3bf94a3a33df2282 100644 (file)
--- a/crypto/vmac.c
+++ b/crypto/vmac.c
@@ -620,9 +620,10 @@ static int vmac_create(struct crypto_template *tmpl, struct rtattr **tb)
        struct shash_instance *inst;
        struct crypto_cipher_spawn *spawn;
        struct crypto_alg *alg;
+       u32 mask;
        int err;
 
-       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SHASH);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SHASH, &mask);
        if (err)
                return err;
 
@@ -632,7 +633,7 @@ static int vmac_create(struct crypto_template *tmpl, struct rtattr **tb)
        spawn = shash_instance_ctx(inst);
 
        err = crypto_grab_cipher(spawn, shash_crypto_instance(inst),
-                                crypto_attr_alg_name(tb[1]), 0, 0);
+                                crypto_attr_alg_name(tb[1]), 0, mask);
        if (err)
                goto err_free_inst;
        alg = crypto_spawn_cipher_alg(spawn);

diff --git a/crypto/xcbc.c b/crypto/xcbc.c
index 598ec88abf0f9f6945a2bccdb82d2a5cbaeba529..af3b7eb5d7c7a2fd3ae5f87348fb514efe4218b2 100644 (file)
--- a/crypto/xcbc.c
+++ b/crypto/xcbc.c
@@ -191,9 +191,10 @@ static int xcbc_create(struct crypto_template *tmpl, struct rtattr **tb)
        struct crypto_cipher_spawn *spawn;
        struct crypto_alg *alg;
        unsigned long alignmask;
+       u32 mask;
        int err;
 
-       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SHASH);
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SHASH, &mask);
        if (err)
                return err;
 
@@ -203,7 +204,7 @@ static int xcbc_create(struct crypto_template *tmpl, struct rtattr **tb)
        spawn = shash_instance_ctx(inst);
 
        err = crypto_grab_cipher(spawn, shash_crypto_instance(inst),
-                                crypto_attr_alg_name(tb[1]), 0, 0);
+                                crypto_attr_alg_name(tb[1]), 0, mask);
        if (err)
                goto err_free_inst;
        alg = crypto_spawn_cipher_alg(spawn);

diff --git a/crypto/xts.c b/crypto/xts.c
index 3565f3b863a61c70a868bb01b683555b0db203eb..35a30610569b197b3f4fc3ea0638329cad9f8bd2 100644 (file)
--- a/crypto/xts.c
+++ b/crypto/xts.c
@@ -331,19 +331,17 @@ static void crypto_xts_free(struct skcipher_instance *inst)
 static int create(struct crypto_template *tmpl, struct rtattr **tb)
 {
        struct skcipher_instance *inst;
-       struct crypto_attr_type *algt;
        struct xts_instance_ctx *ctx;
        struct skcipher_alg *alg;
        const char *cipher_name;
        u32 mask;
        int err;
 
-       algt = crypto_get_attr_type(tb);
-       if (IS_ERR(algt))
-               return PTR_ERR(algt);
-
-       if ((algt->type ^ CRYPTO_ALG_TYPE_SKCIPHER) & algt->mask)
-               return -EINVAL;
+       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SKCIPHER, &mask);
+       if (err)
+               return err;
+       mask |= crypto_requires_off(crypto_get_attr_type(tb),
+                                   CRYPTO_ALG_NEED_FALLBACK);
 
        cipher_name = crypto_attr_alg_name(tb[1]);
        if (IS_ERR(cipher_name))
@@ -355,10 +353,6 @@ static int create(struct crypto_template *tmpl, struct rtattr **tb)
 
        ctx = skcipher_instance_ctx(inst);
 
-       mask = crypto_requires_off(algt->type, algt->mask,
-                                  CRYPTO_ALG_NEED_FALLBACK |
-                                  CRYPTO_ALG_ASYNC);
-
        err = crypto_grab_skcipher(&ctx->spawn, skcipher_crypto_instance(inst),
                                   cipher_name, 0, mask);
        if (err == -ENOENT) {
@@ -415,7 +409,6 @@ static int create(struct crypto_template *tmpl, struct rtattr **tb)
        } else
                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 = XTS_BLOCK_SIZE;
        inst->alg.base.cra_alignmask = alg->base.cra_alignmask |

diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 00a9cf98debe2c80c535667e5a8adc92662d1770..da64c37482b487601375b935aba9ec00e6b13f15 100644 (file)
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -116,7 +116,7 @@ struct crypto_tfm *crypto_spawn_tfm(struct crypto_spawn *spawn, u32 type,
 void *crypto_spawn_tfm2(struct crypto_spawn *spawn);
 
 struct crypto_attr_type *crypto_get_attr_type(struct rtattr **tb);
-int crypto_check_attr_type(struct rtattr **tb, u32 type);
+int crypto_check_attr_type(struct rtattr **tb, u32 type, u32 *mask_ret);
 const char *crypto_attr_alg_name(struct rtattr *rta);
 int crypto_attr_u32(struct rtattr *rta, u32 *num);
 int crypto_inst_setname(struct crypto_instance *inst, const char *name,
@@ -235,18 +235,27 @@ static inline struct crypto_async_request *crypto_get_backlog(
               container_of(queue->backlog, struct crypto_async_request, list);
 }
 
-static inline int crypto_requires_off(u32 type, u32 mask, u32 off)
+static inline u32 crypto_requires_off(struct crypto_attr_type *algt, u32 off)
 {
-       return (type ^ off) & mask & off;
+       return (algt->type ^ off) & algt->mask & off;
 }
 
 /*
- * Returns CRYPTO_ALG_ASYNC if type/mask requires the use of sync algorithms.
- * Otherwise returns zero.
+ * When an algorithm uses another algorithm (e.g., if it's an instance of a
+ * template), these are the flags that should always be set on the "outer"
+ * algorithm if any "inner" algorithm has them set.
  */
-static inline int crypto_requires_sync(u32 type, u32 mask)
+#define CRYPTO_ALG_INHERITED_FLAGS     CRYPTO_ALG_ASYNC
+
+/*
+ * Given the type and mask that specify the flags restrictions on a template
+ * instance being created, return the mask that should be passed to
+ * crypto_grab_*() (along with type=0) to honor any request the user made to
+ * have any of the CRYPTO_ALG_INHERITED_FLAGS clear.
+ */
+static inline u32 crypto_algt_inherited_mask(struct crypto_attr_type *algt)
 {
-       return crypto_requires_off(type, mask, CRYPTO_ALG_ASYNC);
+       return crypto_requires_off(algt, CRYPTO_ALG_INHERITED_FLAGS);
 }
 
 noinline unsigned long __crypto_memneq(const void *a, const void *b, size_t size);