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 /include | |
| parent | 5bdd9ad875b6edf213f54ec3986ed9e8640c5cf9 (diff) | |
| parent | 357d065a44cdd77ed5ff35155a989f2a763e96ef (diff) | |
| download | linux-d53e860fd46f3d95c437bb67518f7374500de467.tar.bz2 | |
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 'include')
| -rw-r--r-- | include/crypto/hash.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/crypto/hash.h b/include/crypto/hash.h index d21bea2c4382..d6702b4a457f 100644 --- a/include/crypto/hash.h +++ b/include/crypto/hash.h @@ -150,7 +150,13 @@ struct shash_desc { }; #define HASH_MAX_DIGESTSIZE 64 -#define HASH_MAX_DESCSIZE 360 + +/* + * Worst case is hmac(sha3-224-generic). Its context is a nested 'shash_desc' + * containing a 'struct sha3_state'. + */ +#define HASH_MAX_DESCSIZE (sizeof(struct shash_desc) + 360) + #define HASH_MAX_STATESIZE 512 #define SHASH_DESC_ON_STACK(shash, ctx) \ |