diff options
author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-09-01 14:25:43 +0100 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2016-11-20 01:17:24 +0000 |
commit | 151b56d3a125c25533a084b9842d15965e575eae (patch) | |
tree | 8928050c6e39d3b3705bcc2d3b3dab963b80ab39 /crypto/cryptd.c | |
parent | fbdcb5e26075148e32c3c5aadc8656f71cc6fa67 (diff) | |
download | linux-stable-151b56d3a125c25533a084b9842d15965e575eae.tar.gz linux-stable-151b56d3a125c25533a084b9842d15965e575eae.tar.bz2 linux-stable-151b56d3a125c25533a084b9842d15965e575eae.zip |
crypto: cryptd - initialize child shash_desc on import
commit 0bd2223594a4dcddc1e34b15774a3a4776f7749e upstream.
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()
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'crypto/cryptd.c')
-rw-r--r-- | crypto/cryptd.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crypto/cryptd.c b/crypto/cryptd.c index 75c415d37086..d85fab975514 100644 --- a/crypto/cryptd.c +++ b/crypto/cryptd.c @@ -565,9 +565,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, |