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 /drivers/crypto/vmx/aesp8-ppc.pl | |
| parent | Merge tag 'kbuild-fixes-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild (diff) | |
| parent | crypto: vmx - ghash: do nosimd fallback manually (diff) | |
| download | linux-dev-d53e860fd46f3d95c437bb67518f7374500de467.tar.xz linux-dev-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 'drivers/crypto/vmx/aesp8-ppc.pl')
| -rw-r--r-- | drivers/crypto/vmx/aesp8-ppc.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/vmx/aesp8-ppc.pl b/drivers/crypto/vmx/aesp8-ppc.pl index de78282b8f44..9c6b5c1d6a1a 100644 --- a/drivers/crypto/vmx/aesp8-ppc.pl +++ b/drivers/crypto/vmx/aesp8-ppc.pl @@ -1357,7 +1357,7 @@ Loop_ctr32_enc: addi $idx,$idx,16 bdnz Loop_ctr32_enc - vadduwm $ivec,$ivec,$one + vadduqm $ivec,$ivec,$one vmr $dat,$inptail lvx $inptail,0,$inp addi $inp,$inp,16 |