From 70c9466818f943f065a9b6da45e7a0316f24240a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 6 Jun 2025 11:54:29 +0000 Subject: [PATCH] Revert "crypto: ahash - Set default reqsize from ahash_alg" This reverts commit 9f27b38771b05067f5fadf4628296efb768e50d4 which is commit 9e01aaa1033d6e40f8d7cf4f20931a61ce9e3f04 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: Ib90b0adcb219ff6bbb5771482f0e456bed7cdc40 Signed-off-by: Greg Kroah-Hartman --- crypto/ahash.c | 4 ---- include/crypto/hash.h | 3 --- 2 files changed, 7 deletions(-) diff --git a/crypto/ahash.c b/crypto/ahash.c index fe19bf7f15eb..bcd9de009a91 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -473,7 +473,6 @@ 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); if (tfm->__crt_alg->cra_type == &crypto_shash_type) return crypto_init_ahash_using_shash(tfm); @@ -639,9 +638,6 @@ static int ahash_prepare_alg(struct ahash_alg *alg) if (alg->halg.statesize == 0) return -EINVAL; - if (alg->reqsize && alg->reqsize < alg->halg.statesize) - return -EINVAL; - err = hash_prepare_alg(&alg->halg); if (err) return err; diff --git a/include/crypto/hash.h b/include/crypto/hash.h index 20dbb24a8cbe..38511727b2ff 100644 --- a/include/crypto/hash.h +++ b/include/crypto/hash.h @@ -132,7 +132,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 { @@ -149,8 +148,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; };