mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: - Two long-standing bugs in the powerpc assembly of vmx - Stack overrun caused by HASH_MAX_DESCSIZE being too small - Regression in caam * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: vmx - ghash: do nosimd fallback manually crypto: vmx - CTR: always increment IV as quadword crypto: hash - fix incorrect HASH_MAX_DESCSIZE crypto: caam - fix typo in i.MX6 devices list for errata
This commit is contained in:
commit
d53e860fd4
5 changed files with 97 additions and 128 deletions
|
|
@ -157,6 +157,8 @@ static int hmac_init_tfm(struct crypto_tfm *tfm)
|
|||
|
||||
parent->descsize = sizeof(struct shash_desc) +
|
||||
crypto_shash_descsize(hash);
|
||||
if (WARN_ON(parent->descsize > HASH_MAX_DESCSIZE))
|
||||
return -EINVAL;
|
||||
|
||||
ctx->hash = hash;
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue