1 files changed, 209 insertions, 112 deletions

diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index ae5fa99d5d3..35335825a4e 100644
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -39,6 +39,11 @@ struct cryptd_instance_ctx {
         struct cryptd_queue *queue;
 };
 
+struct hashd_instance_ctx {
+        struct crypto_shash_spawn spawn;
+        struct cryptd_queue *queue;
+};
+
 struct cryptd_blkcipher_ctx {
         struct crypto_blkcipher *child;
 };
@@ -48,11 +53,12 @@ struct cryptd_blkcipher_request_ctx {
 };
 
 struct cryptd_hash_ctx {
-        struct crypto_hash *child;
+        struct crypto_shash *child;
 };
 
 struct cryptd_hash_request_ctx {
         crypto_completion_t complete;
+        struct shash_desc desc;
 };
 
 static void cryptd_queue_worker(struct work_struct *work);
@@ -249,32 +255,24 @@ static void cryptd_blkcipher_exit_tfm(struct crypto_tfm *tfm)
         crypto_free_blkcipher(ctx->child);
 }
 
-static struct crypto_instance *cryptd_alloc_instance(struct crypto_alg *alg,
-                                                     struct cryptd_queue *queue)
+static void *cryptd_alloc_instance(struct crypto_alg *alg, unsigned int head,
+                                   unsigned int tail)
 {
+        char *p;
         struct crypto_instance *inst;
-        struct cryptd_instance_ctx *ctx;
         int err;
 
-        inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
-        if (!inst) {
-                inst = ERR_PTR(-ENOMEM);
-                goto out;
-        }
+        p = kzalloc(head + sizeof(*inst) + tail, GFP_KERNEL);
+        if (!p)
+                return ERR_PTR(-ENOMEM);
+
+        inst = (void *)(p + head);
 
         err = -ENAMETOOLONG;
         if (snprintf(inst->alg.cra_driver_name, CRYPTO_MAX_ALG_NAME,
                      "cryptd(%s)", alg->cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
                 goto out_free_inst;
 
-        ctx = crypto_instance_ctx(inst);
-        err = crypto_init_spawn(&ctx->spawn, alg, inst,
-                                CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC);
-        if (err)
-                goto out_free_inst;
-
-        ctx->queue = queue;
-
         memcpy(inst->alg.cra_name, alg->cra_name, CRYPTO_MAX_ALG_NAME);
 
         inst->alg.cra_priority = alg->cra_priority + 50;
@@ -282,29 +280,41 @@ static struct crypto_instance *cryptd_alloc_instance(struct crypto_alg *alg,
         inst->alg.cra_alignmask = alg->cra_alignmask;
 
 out:
-        return inst;
+        return p;
 
 out_free_inst:
-        kfree(inst);
-        inst = ERR_PTR(err);
+        kfree(p);
+        p = ERR_PTR(err);
         goto out;
 }
 
-static struct crypto_instance *cryptd_alloc_blkcipher(
-        struct rtattr **tb, struct cryptd_queue *queue)
+static int cryptd_create_blkcipher(struct crypto_template *tmpl,
+                                   struct rtattr **tb,
+                                   struct cryptd_queue *queue)
 {
+        struct cryptd_instance_ctx *ctx;
         struct crypto_instance *inst;
         struct crypto_alg *alg;
+        int err;
 
         alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_BLKCIPHER,
                                   CRYPTO_ALG_TYPE_MASK);
         if (IS_ERR(alg))
-                return ERR_CAST(alg);
+                return PTR_ERR(alg);
 
-        inst = cryptd_alloc_instance(alg, queue);
+        inst = cryptd_alloc_instance(alg, 0, sizeof(*ctx));
+        err = PTR_ERR(inst);
         if (IS_ERR(inst))
                 goto out_put_alg;
 
+        ctx = crypto_instance_ctx(inst);
+        ctx->queue = queue;
+
+        err = crypto_init_spawn(&ctx->spawn, alg, inst,
+                                CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC);
+        if (err)
+                goto out_free_inst;
+
         inst->alg.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC;
         inst->alg.cra_type = &crypto_ablkcipher_type;
 
@@ -323,26 +333,34 @@ static struct crypto_instance *cryptd_alloc_blkcipher(
         inst->alg.cra_ablkcipher.encrypt = cryptd_blkcipher_encrypt_enqueue;
         inst->alg.cra_ablkcipher.decrypt = cryptd_blkcipher_decrypt_enqueue;
 
+        err = crypto_register_instance(tmpl, inst);
+        if (err) {
+                crypto_drop_spawn(&ctx->spawn);
+out_free_inst:
+                kfree(inst);
+        }
+
 out_put_alg:
         crypto_mod_put(alg);
-        return inst;
+        return err;
 }
 
 static int cryptd_hash_init_tfm(struct crypto_tfm *tfm)
 {
         struct crypto_instance *inst = crypto_tfm_alg_instance(tfm);
-        struct cryptd_instance_ctx *ictx = crypto_instance_ctx(inst);
-        struct crypto_spawn *spawn = &ictx->spawn;
+        struct hashd_instance_ctx *ictx = crypto_instance_ctx(inst);
+        struct crypto_shash_spawn *spawn = &ictx->spawn;
         struct cryptd_hash_ctx *ctx = crypto_tfm_ctx(tfm);
-        struct crypto_hash *cipher;
+        struct crypto_shash *hash;
 
-        cipher = crypto_spawn_hash(spawn);
-        if (IS_ERR(cipher))
-                return PTR_ERR(cipher);
+        hash = crypto_spawn_shash(spawn);
+        if (IS_ERR(hash))
+                return PTR_ERR(hash);
 
-        ctx->child = cipher;
-        tfm->crt_ahash.reqsize =
-                sizeof(struct cryptd_hash_request_ctx);
+        ctx->child = hash;
+        crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm),
+                                 sizeof(struct cryptd_hash_request_ctx) +
+                                 crypto_shash_descsize(hash));
         return 0;
 }
 
@@ -350,22 +368,22 @@ static void cryptd_hash_exit_tfm(struct crypto_tfm *tfm)
 {
         struct cryptd_hash_ctx *ctx = crypto_tfm_ctx(tfm);
 
-        crypto_free_hash(ctx->child);
+        crypto_free_shash(ctx->child);
 }
 
 static int cryptd_hash_setkey(struct crypto_ahash *parent,
                                    const u8 *key, unsigned int keylen)
 {
         struct cryptd_hash_ctx *ctx   = crypto_ahash_ctx(parent);
-        struct crypto_hash     *child = ctx->child;
+        struct crypto_shash *child = ctx->child;
         int err;
 
-        crypto_hash_clear_flags(child, CRYPTO_TFM_REQ_MASK);
-        crypto_hash_set_flags(child, crypto_ahash_get_flags(parent) &
-                                          CRYPTO_TFM_REQ_MASK);
-        err = crypto_hash_setkey(child, key, keylen);
-        crypto_ahash_set_flags(parent, crypto_hash_get_flags(child) &
-                                            CRYPTO_TFM_RES_MASK);
+        crypto_shash_clear_flags(child, CRYPTO_TFM_REQ_MASK);
+        crypto_shash_set_flags(child, crypto_ahash_get_flags(parent) &
+                                      CRYPTO_TFM_REQ_MASK);
+        err = crypto_shash_setkey(child, key, keylen);
+        crypto_ahash_set_flags(parent, crypto_shash_get_flags(child) &
+                                       CRYPTO_TFM_RES_MASK);
         return err;
 }
 
@@ -385,21 +403,19 @@ static int cryptd_hash_enqueue(struct ahash_request *req,
 
 static void cryptd_hash_init(struct crypto_async_request *req_async, int err)
 {
-        struct cryptd_hash_ctx *ctx   = crypto_tfm_ctx(req_async->tfm);
-        struct crypto_hash     *child = ctx->child;
-        struct ahash_request    *req = ahash_request_cast(req_async);
-        struct cryptd_hash_request_ctx *rctx;
-        struct hash_desc desc;
-
-        rctx = ahash_request_ctx(req);
+        struct cryptd_hash_ctx *ctx = crypto_tfm_ctx(req_async->tfm);
+        struct crypto_shash *child = ctx->child;
+        struct ahash_request *req = ahash_request_cast(req_async);
+        struct cryptd_hash_request_ctx *rctx = ahash_request_ctx(req);
+        struct shash_desc *desc = &rctx->desc;
 
         if (unlikely(err == -EINPROGRESS))
                 goto out;
 
-        desc.tfm = child;
-        desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;
+        desc->tfm = child;
+        desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
 
-        err = crypto_hash_crt(child)->init(&desc);
+        err = crypto_shash_init(desc);
 
         req->base.complete = rctx->complete;
 
@@ -416,23 +432,15 @@ static int cryptd_hash_init_enqueue(struct ahash_request *req)
 
 static void cryptd_hash_update(struct crypto_async_request *req_async, int err)
 {
-        struct cryptd_hash_ctx *ctx   = crypto_tfm_ctx(req_async->tfm);
-        struct crypto_hash     *child = ctx->child;
-        struct ahash_request    *req = ahash_request_cast(req_async);
+        struct ahash_request *req = ahash_request_cast(req_async);
         struct cryptd_hash_request_ctx *rctx;
-        struct hash_desc desc;
 
         rctx = ahash_request_ctx(req);
 
         if (unlikely(err == -EINPROGRESS))
                 goto out;
 
-        desc.tfm = child;
-        desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;
-
-        err = crypto_hash_crt(child)->update(&desc,
-                                                req->src,
-                                                req->nbytes);
+        err = shash_ahash_update(req, &rctx->desc);
 
         req->base.complete = rctx->complete;
 
@@ -449,21 +457,13 @@ static int cryptd_hash_update_enqueue(struct ahash_request *req)
 
 static void cryptd_hash_final(struct crypto_async_request *req_async, int err)
 {
-        struct cryptd_hash_ctx *ctx   = crypto_tfm_ctx(req_async->tfm);
-        struct crypto_hash     *child = ctx->child;
-        struct ahash_request    *req = ahash_request_cast(req_async);
-        struct cryptd_hash_request_ctx *rctx;
-        struct hash_desc desc;
-
-        rctx = ahash_request_ctx(req);
+        struct ahash_request *req = ahash_request_cast(req_async);
+        struct cryptd_hash_request_ctx *rctx = ahash_request_ctx(req);
 
         if (unlikely(err == -EINPROGRESS))
                 goto out;
 
-        desc.tfm = child;
-        desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;
-
-        err = crypto_hash_crt(child)->final(&desc, req->result);
+        err = crypto_shash_final(&rctx->desc, req->result);
 
         req->base.complete = rctx->complete;
 
@@ -478,26 +478,44 @@ static int cryptd_hash_final_enqueue(struct ahash_request *req)
         return cryptd_hash_enqueue(req, cryptd_hash_final);
 }
 
-static void cryptd_hash_digest(struct crypto_async_request *req_async, int err)
+static void cryptd_hash_finup(struct crypto_async_request *req_async, int err)
 {
-        struct cryptd_hash_ctx *ctx   = crypto_tfm_ctx(req_async->tfm);
-        struct crypto_hash     *child = ctx->child;
-        struct ahash_request    *req = ahash_request_cast(req_async);
-        struct cryptd_hash_request_ctx *rctx;
-        struct hash_desc desc;
+        struct ahash_request *req = ahash_request_cast(req_async);
+        struct cryptd_hash_request_ctx *rctx = ahash_request_ctx(req);
 
-        rctx = ahash_request_ctx(req);
+        if (unlikely(err == -EINPROGRESS))
+                goto out;
+
+        err = shash_ahash_finup(req, &rctx->desc);
+
+        req->base.complete = rctx->complete;
+
+out:
+        local_bh_disable();
+        rctx->complete(&req->base, err);
+        local_bh_enable();
+}
+
+static int cryptd_hash_finup_enqueue(struct ahash_request *req)
+{
+        return cryptd_hash_enqueue(req, cryptd_hash_finup);
+}
+
+static void cryptd_hash_digest(struct crypto_async_request *req_async, int err)
+{
+        struct cryptd_hash_ctx *ctx = crypto_tfm_ctx(req_async->tfm);
+        struct crypto_shash *child = ctx->child;
+        struct ahash_request *req = ahash_request_cast(req_async);
+        struct cryptd_hash_request_ctx *rctx = ahash_request_ctx(req);
+        struct shash_desc *desc = &rctx->desc;
 
         if (unlikely(err == -EINPROGRESS))
                 goto out;
 
-        desc.tfm = child;
-        desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;
+        desc->tfm = child;
+        desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
 
-        err = crypto_hash_crt(child)->digest(&desc,
-                                                req->src,
-                                                req->nbytes,
-                                                req->result);
+        err = shash_ahash_digest(req, desc);
 
         req->base.complete = rctx->complete;
 
@@ -512,64 +530,108 @@ static int cryptd_hash_digest_enqueue(struct ahash_request *req)
         return cryptd_hash_enqueue(req, cryptd_hash_digest);
 }
 
-static struct crypto_instance *cryptd_alloc_hash(
-        struct rtattr **tb, struct cryptd_queue *queue)
+static int cryptd_hash_export(struct ahash_request *req, void *out)
 {
-        struct crypto_instance *inst;
+        struct cryptd_hash_request_ctx *rctx = ahash_request_ctx(req);
+
+        return crypto_shash_export(&rctx->desc, out);
+}
+
+static int cryptd_hash_import(struct ahash_request *req, const void *in)
+{
+        struct cryptd_hash_request_ctx *rctx = ahash_request_ctx(req);
+
+        return crypto_shash_import(&rctx->desc, in);
+}
+
+static int cryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb,
+                              struct cryptd_queue *queue)
+{
+        struct hashd_instance_ctx *ctx;
+        struct ahash_instance *inst;
+        struct shash_alg *salg;
         struct crypto_alg *alg;
+        int err;
 
-        alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_HASH,
-                                  CRYPTO_ALG_TYPE_HASH_MASK);
-        if (IS_ERR(alg))
-                return ERR_PTR(PTR_ERR(alg));
+        salg = shash_attr_alg(tb[1], 0, 0);
+        if (IS_ERR(salg))
+                return PTR_ERR(salg);
 
-        inst = cryptd_alloc_instance(alg, queue);
+        alg = &salg->base;
+        inst = cryptd_alloc_instance(alg, ahash_instance_headroom(),
+                                     sizeof(*ctx));
+        err = PTR_ERR(inst);
         if (IS_ERR(inst))
                 goto out_put_alg;
 
-        inst->alg.cra_flags = CRYPTO_ALG_TYPE_AHASH | CRYPTO_ALG_ASYNC;
-        inst->alg.cra_type = &crypto_ahash_type;
+        ctx = ahash_instance_ctx(inst);
+        ctx->queue = queue;
 
-        inst->alg.cra_ahash.digestsize = alg->cra_hash.digestsize;
-        inst->alg.cra_ctxsize = sizeof(struct cryptd_hash_ctx);
+        err = crypto_init_shash_spawn(&ctx->spawn, salg,
+                                      ahash_crypto_instance(inst));
+        if (err)
+                goto out_free_inst;
 
-        inst->alg.cra_init = cryptd_hash_init_tfm;
-        inst->alg.cra_exit = cryptd_hash_exit_tfm;
+        inst->alg.halg.base.cra_flags = CRYPTO_ALG_ASYNC;
 
-        inst->alg.cra_ahash.init   = cryptd_hash_init_enqueue;
-        inst->alg.cra_ahash.update = cryptd_hash_update_enqueue;
-        inst->alg.cra_ahash.final  = cryptd_hash_final_enqueue;
-        inst->alg.cra_ahash.setkey = cryptd_hash_setkey;
-        inst->alg.cra_ahash.digest = cryptd_hash_digest_enqueue;
+        inst->alg.halg.digestsize = salg->digestsize;
+        inst->alg.halg.base.cra_ctxsize = sizeof(struct cryptd_hash_ctx);
+
+        inst->alg.halg.base.cra_init = cryptd_hash_init_tfm;
+        inst->alg.halg.base.cra_exit = cryptd_hash_exit_tfm;
+
+        inst->alg.init   = cryptd_hash_init_enqueue;
+        inst->alg.update = cryptd_hash_update_enqueue;
+        inst->alg.final  = cryptd_hash_final_enqueue;
+        inst->alg.finup  = cryptd_hash_finup_enqueue;
+        inst->alg.export = cryptd_hash_export;
+        inst->alg.import = cryptd_hash_import;
+        inst->alg.setkey = cryptd_hash_setkey;
+        inst->alg.digest = cryptd_hash_digest_enqueue;
+
+        err = ahash_register_instance(tmpl, inst);
+        if (err) {
+                crypto_drop_shash(&ctx->spawn);
+out_free_inst:
+                kfree(inst);
+        }
 
 out_put_alg:
         crypto_mod_put(alg);
-        return inst;
+        return err;
 }
 
 static struct cryptd_queue queue;
 
-static struct crypto_instance *cryptd_alloc(struct rtattr **tb)
+static int cryptd_create(struct crypto_template *tmpl, struct rtattr **tb)
 {
         struct crypto_attr_type *algt;
 
         algt = crypto_get_attr_type(tb);
         if (IS_ERR(algt))
-                return ERR_CAST(algt);
+                return PTR_ERR(algt);
 
         switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) {
         case CRYPTO_ALG_TYPE_BLKCIPHER:
-                return cryptd_alloc_blkcipher(tb, &queue);
+                return cryptd_create_blkcipher(tmpl, tb, &queue);
         case CRYPTO_ALG_TYPE_DIGEST:
-                return cryptd_alloc_hash(tb, &queue);
+                return cryptd_create_hash(tmpl, tb, &queue);
         }
 
-        return ERR_PTR(-EINVAL);
+        return -EINVAL;
 }
 
 static void cryptd_free(struct crypto_instance *inst)
 {
         struct cryptd_instance_ctx *ctx = crypto_instance_ctx(inst);
+        struct hashd_instance_ctx *hctx = crypto_instance_ctx(inst);
+
+        switch (inst->alg.cra_flags & CRYPTO_ALG_TYPE_MASK) {
+        case CRYPTO_ALG_TYPE_AHASH:
+                crypto_drop_shash(&hctx->spawn);
+                kfree(ahash_instance(inst));
+                return;
+        }
 
         crypto_drop_spawn(&ctx->spawn);
         kfree(inst);
@@ -577,7 +639,7 @@ static void cryptd_free(struct crypto_instance *inst)
 
 static struct crypto_template cryptd_tmpl = {
         .name = "cryptd",
-        .alloc = cryptd_alloc,
+        .create = cryptd_create,
         .free = cryptd_free,
         .module = THIS_MODULE,
 };
@@ -620,6 +682,41 @@ void cryptd_free_ablkcipher(struct cryptd_ablkcipher *tfm)
 }
 EXPORT_SYMBOL_GPL(cryptd_free_ablkcipher);
 
+struct cryptd_ahash *cryptd_alloc_ahash(const char *alg_name,
+                                        u32 type, u32 mask)
+{
+        char cryptd_alg_name[CRYPTO_MAX_ALG_NAME];
+        struct crypto_ahash *tfm;
+
+        if (snprintf(cryptd_alg_name, CRYPTO_MAX_ALG_NAME,
+                     "cryptd(%s)", alg_name) >= CRYPTO_MAX_ALG_NAME)
+                return ERR_PTR(-EINVAL);
+        tfm = crypto_alloc_ahash(cryptd_alg_name, type, mask);
+        if (IS_ERR(tfm))
+                return ERR_CAST(tfm);
+        if (tfm->base.__crt_alg->cra_module != THIS_MODULE) {
+                crypto_free_ahash(tfm);
+                return ERR_PTR(-EINVAL);
+        }
+
+        return __cryptd_ahash_cast(tfm);
+}
+EXPORT_SYMBOL_GPL(cryptd_alloc_ahash);
+
+struct crypto_shash *cryptd_ahash_child(struct cryptd_ahash *tfm)
+{
+        struct cryptd_hash_ctx *ctx = crypto_ahash_ctx(&tfm->base);
+
+        return ctx->child;
+}
+EXPORT_SYMBOL_GPL(cryptd_ahash_child);
+
+void cryptd_free_ahash(struct cryptd_ahash *tfm)
+{
+        crypto_free_ahash(&tfm->base);
+}
+EXPORT_SYMBOL_GPL(cryptd_free_ahash);
+
 static int __init cryptd_init(void)
 {
         int err;