diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2025-06-13 16:51:38 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-08-15 16:39:00 +0200 |
| commit | 7705ef5d26818844f4f9b953d20975e57eb8f41f (patch) | |
| tree | 1ba77ad2ac05c721d9d9581887d52eaabc958cd8 | |
| parent | add7a701d14b3936f849f957a25c215c6d9a5146 (diff) | |
crypto: ahash - Stop legacy tfms from using the set_virt fallback path
[ Upstream commit 1e2b7fcd3f075ff8c5b0e4474fe145d1c685f54f ]
Ensure that drivers that have not been converted to the ahash API
do not use the ahash_request_set_virt fallback path as they cannot
use the software fallback.
Reported-by: Eric Biggers <ebiggers@kernel.org>
Fixes: 9d7a0ab1c753 ("crypto: ahash - Handle partial blocks in API")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | crypto/ahash.c | 3 | ||||
| -rw-r--r-- | include/crypto/internal/hash.h | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c index 3878b4da3cfd..2f06e6b4f601 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -350,6 +350,9 @@ static int ahash_do_req_chain(struct ahash_request *req, if (!crypto_ahash_need_fallback(tfm)) return -ENOSYS; + if (crypto_hash_no_export_core(tfm)) + return -ENOSYS; + { u8 state[HASH_MAX_STATESIZE]; diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h index 0f85c543f80b..f052afa6e7b0 100644 --- a/include/crypto/internal/hash.h +++ b/include/crypto/internal/hash.h @@ -91,6 +91,12 @@ static inline bool crypto_hash_alg_needs_key(struct hash_alg_common *alg) !(alg->base.cra_flags & CRYPTO_ALG_OPTIONAL_KEY); } +static inline bool crypto_hash_no_export_core(struct crypto_ahash *tfm) +{ + return crypto_hash_alg_common(tfm)->base.cra_flags & + CRYPTO_AHASH_ALG_NO_EXPORT_CORE; +} + int crypto_grab_ahash(struct crypto_ahash_spawn *spawn, struct crypto_instance *inst, const char *name, u32 type, u32 mask); |