summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2016-09-01 14:25:43 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2016-09-07 21:04:36 +0800
commit0bd2223594a4dcddc1e34b15774a3a4776f7749e (patch)
treeb4b590508cb653ed43308b63ce1c4ec9dcfd255f /crypto
parent8b18e2359aff2ab810aba84cebffc9da07fef78f (diff)
downloadlinux-0bd2223594a4dcddc1e34b15774a3a4776f7749e.tar.gz
linux-0bd2223594a4dcddc1e34b15774a3a4776f7749e.tar.bz2
linux-0bd2223594a4dcddc1e34b15774a3a4776f7749e.zip
crypto: cryptd - initialize child shash_desc on import
When calling .import() on a cryptd ahash_request, the structure members that describe the child transform in the shash_desc need to be initialized like they are when calling .init() Cc: stable@vger.kernel.org Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/cryptd.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index 77207b41940c..0c654e59f215 100644
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -631,9 +631,14 @@ static int cryptd_hash_export(struct ahash_request *req, void *out)
static int cryptd_hash_import(struct ahash_request *req, const void *in)
{
- struct cryptd_hash_request_ctx *rctx = ahash_request_ctx(req);
+ struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
+ struct cryptd_hash_ctx *ctx = crypto_ahash_ctx(tfm);
+ struct shash_desc *desc = cryptd_shash_desc(req);
+
+ desc->tfm = ctx->child;
+ desc->flags = req->base.flags;
- return crypto_shash_import(&rctx->desc, in);
+ return crypto_shash_import(desc, in);
}
static int cryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb,