diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-21 12:24:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-21 12:24:24 -0700 |
| commit | d53e860fd46f3d95c437bb67518f7374500de467 (patch) | |
| tree | 55256ae2f959a7ebab678fd9509ed91fb90d3322 /crypto | |
| parent | 5bdd9ad875b6edf213f54ec3986ed9e8640c5cf9 (diff) | |
| parent | 357d065a44cdd77ed5ff35155a989f2a763e96ef (diff) | |
| download | linux-d53e860fd46f3d95c437bb67518f7374500de467.tar.gz linux-d53e860fd46f3d95c437bb67518f7374500de467.tar.bz2 linux-d53e860fd46f3d95c437bb67518f7374500de467.zip | |
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
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/hmac.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/hmac.c b/crypto/hmac.c index a68c1266121f..241b1868c1d0 100644 --- a/crypto/hmac.c +++ b/crypto/hmac.c @@ -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; |