diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-10-09 20:43:33 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-11-13 13:17:55 -0500 |
| commit | e360fb086858344811bdc2f2b4c5ef6396e78179 (patch) | |
| tree | 96ceb9001da7db2ead432881f21cc0b33b3825e9 /crypto | |
| parent | d9d554c9e98a9f63fdfa5c72049f0b126d58df76 (diff) | |
crypto: ahash - ensure statesize is non-zero
[ Upstream commit 8996eafdcbad149ac0f772fb1649fbb75c482a6a ]
Unlike shash algorithms, ahash drivers must implement export
and import as their descriptors may contain hardware state and
cannot be exported as is. Unfortunately some ahash drivers did
not provide them and end up causing crashes with algif_hash.
This patch adds a check to prevent these drivers from registering
ahash algorithms until they are fixed.
Cc: stable@vger.kernel.org
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/ahash.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c index f6a36a52d738..c1d8591913e9 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -543,7 +543,8 @@ static int ahash_prepare_alg(struct ahash_alg *alg) struct crypto_alg *base = &alg->halg.base; if (alg->halg.digestsize > PAGE_SIZE / 8 || - alg->halg.statesize > PAGE_SIZE / 8) + alg->halg.statesize > PAGE_SIZE / 8 || + alg->halg.statesize == 0) return -EINVAL; base->cra_type = &crypto_ahash_type; |