summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-10-13 10:18:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-13 10:18:54 -0700
commit6006d4521b158e5ef48620e8c9028bba91bf985d (patch)
tree0513b2a3acb5c536fc815a2c6055f1ee2af7a341 /crypto
parent75542253127d4e4003a5542189c53ff85e4b27b2 (diff)
parent8996eafdcbad149ac0f772fb1649fbb75c482a6a (diff)
downloadlinux-6006d4521b158e5ef48620e8c9028bba91bf985d.tar.gz
linux-6006d4521b158e5ef48620e8c9028bba91bf985d.tar.bz2
linux-6006d4521b158e5ef48620e8c9028bba91bf985d.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 'crypto')
-rw-r--r--crypto/ahash.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c
index 8acb886032ae..9c1dc8d6106a 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;