From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 7 Apr 2025 10:21:11 +0000 (+0800)
Subject: crypto: ahash - Use cra_reqsize
X-Git-Tag: block-6.16-20250606~34^2~286
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c360df01c6c19959d2218cbad56d5b7c2ac7a476;p=linux-block.git

crypto: ahash - Use cra_reqsize

Use the common reqsize field and remove reqsize from ahash_alg.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/crypto/ahash.c b/crypto/ahash.c
index fc59897c234c..ba0a639144af 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -723,7 +723,7 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm)
 	struct ahash_alg *alg = crypto_ahash_alg(hash);
 
 	crypto_ahash_set_statesize(hash, alg->halg.statesize);
-	crypto_ahash_set_reqsize(hash, alg->reqsize);
+	crypto_ahash_set_reqsize(hash, crypto_tfm_alg_reqsize(tfm));
 
 	if (tfm->__crt_alg->cra_type == &crypto_shash_type)
 		return crypto_init_ahash_using_shash(tfm);
@@ -889,7 +889,7 @@ static int ahash_prepare_alg(struct ahash_alg *alg)
 	if (alg->halg.statesize == 0)
 		return -EINVAL;
 
-	if (alg->reqsize && alg->reqsize < alg->halg.statesize)
+	if (base->cra_reqsize && base->cra_reqsize < alg->halg.statesize)
 		return -EINVAL;
 
 	err = hash_prepare_alg(&alg->halg);
diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index 113a5835e586..eceb2ed04f26 100644
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -136,7 +136,6 @@ struct ahash_request {
  *	      This is a counterpart to @init_tfm, used to remove
  *	      various changes set in @init_tfm.
  * @clone_tfm: Copy transform into new object, may allocate memory.
- * @reqsize: Size of the request context.
  * @halg: see struct hash_alg_common
  */
 struct ahash_alg {
@@ -153,8 +152,6 @@ struct ahash_alg {
 	void (*exit_tfm)(struct crypto_ahash *tfm);
 	int (*clone_tfm)(struct crypto_ahash *dst, struct crypto_ahash *src);
 
-	unsigned int reqsize;
-
 	struct hash_alg_common halg;
 };