crypto: hash - Fix async import on shash algorithm

herbertx · herbertx · commit 90246e79af06 · 2010-11-04T14:48:37.000-04:00
The function shash_async_import did not initialise the descriptor
correctly prior to calling the underlying shash import function.

This patch adds the required initialisation.

Reported-by: Miloslav Trmac &lt;mitr@redhat.com&gt;
Signed-off-by: Herbert Xu &lt;herbert@gondor.apana.org.au&gt;
diff --git a/crypto/shash.c b/crypto/shash.c
@@ -310,7 +310,13 @@ static int shash_async_export(struct ahash_request *req, void *out)
 
 static int shash_async_import(struct ahash_request *req, const void *in)
 {
-	return crypto_shash_import(ahash_request_ctx(req), in);
+	struct crypto_shash **ctx = crypto_ahash_ctx(crypto_ahash_reqtfm(req));
+	struct shash_desc *desc = ahash_request_ctx(req);
+
+	desc->tfm = *ctx;
+	desc->flags = req->base.flags;
+
+	return crypto_shash_import(desc, in);
 }
 
 static void crypto_exit_shash_ops_async(struct crypto_tfm *tfm)

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,13 @@ static int shash_async_export(struct ahash_request req, void out)`
`310`	`310`
`311`	`311`	`static int shash_async_import(struct ahash_request req, const void in)`
`312`	`312`	`{`
`313`		`- return crypto_shash_import(ahash_request_ctx(req), in);`
	`313`	`+ struct crypto_shash **ctx = crypto_ahash_ctx(crypto_ahash_reqtfm(req));`
	`314`	`+ struct shash_desc *desc = ahash_request_ctx(req);`
	`315`	`+`
	`316`	`+ desc->tfm = *ctx;`
	`317`	`+ desc->flags = req->base.flags;`
	`318`	`+`
	`319`	`+ return crypto_shash_import(desc, in);`
`314`	`320`	`}`
`315`	`321`
`316`	`322`	`static void crypto_exit_shash_ops_async(struct crypto_tfm *tfm)`