[3.12,090/119] crypto: cryptd - initialize child shash_desc on import

Message ID 8d6f6eb1a459ec5ca3750a3f49d7f6130de6df13.1475144721.git.jslaby@suse.cz
State New
Headers show

Commit Message

Jiri Slaby Sept. 29, 2016, 10:25 a.m.
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>

3.12-stable review patch.  If anyone has any objections, please let me know.


To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



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>
 crypto/cryptd.c | 9 +++++++--
 1 file 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,