diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-13 10:18:54 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-13 10:18:54 -0700 |
commit | 64ad00c1c4480363927292d212e3f49cbeeea00d (patch) | |
tree | a39f8c9ba83b68448a8bddfa39b5451f7416f603 /crypto | |
parent | 82d748eb43a673a56b639efd4d698e1e95715d82 (diff) | |
parent | 68418efba748967f029918a09f01693be1622480 (diff) | |
download | linux-crypto-64ad00c1c4480363927292d212e3f49cbeeea00d.tar.gz linux-crypto-64ad00c1c4480363927292d212e3f49cbeeea00d.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes the following issues:
- Fix AVX detection to prevent use of non-existent AESNI.
- Some SPARC ciphers did not set their IV size which may lead to
memory corruption"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: ahash - ensure statesize is non-zero
crypto: camellia_aesni_avx - Fix CPU feature checks
crypto: sparc - initialize blkcipher.ivsize
Diffstat (limited to '')
-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 8acb8860..9c1dc8d6 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -544,7 +544,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; |