diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-09-01 14:25:43 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-09-29 11:14:26 +0200 |
| commit | 8d6f6eb1a459ec5ca3750a3f49d7f6130de6df13 (patch) | |
| tree | ae4acb7083c22dac0ba211258c8b459d4cf155ea | |
| parent | e5eb7be2db286ec3fdaf5cf5451e653d6a6d95b8 (diff) | |
| download | lwn-8d6f6eb1a459ec5ca3750a3f49d7f6130de6df13.tar.gz lwn-8d6f6eb1a459ec5ca3750a3f49d7f6130de6df13.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: Jiri Slaby <jslaby@suse.cz>
| -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, |