Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87af205b authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Sasha Levin
Browse files

crypto: cryptd - initialize child shash_desc on import 



[ Upstream commit 0bd2223594a4dcddc1e34b15774a3a4776f7749e ]

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: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent f6692fc5

crypto/cryptd.c

+7 −2
Original line number Diff line number Diff line
@@ -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,