diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-28 10:09:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-28 10:09:38 -0700 |
| commit | 30a9e501437e9319a90d66cd8e701f837deacc90 (patch) | |
| tree | f2bc8b1d517ece7520dae853e2a66f881b1e4838 /arch/x86 | |
| parent | Merge branch 'for-3.10' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | crypto: sha256_ssse3 - fix stack corruption with SSSE3 and AVX implementations (diff) | |
| download | linux-dev-30a9e501437e9319a90d66cd8e701f837deacc90.tar.xz linux-dev-30a9e501437e9319a90d66cd8e701f837deacc90.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This push fixes a crash in the new sha256_ssse3 driver as well as a
DMA setup/teardown bug in caam"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: sha256_ssse3 - fix stack corruption with SSSE3 and AVX implementations
crypto: caam - fix inconsistent assoc dma mapping direction
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/crypto/sha256-avx-asm.S | 2 | ||||
| -rw-r--r-- | arch/x86/crypto/sha256-ssse3-asm.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S index 56610c4bf31b..642f15687a0a 100644 --- a/arch/x86/crypto/sha256-avx-asm.S +++ b/arch/x86/crypto/sha256-avx-asm.S @@ -118,7 +118,7 @@ y2 = %r15d _INP_END_SIZE = 8 _INP_SIZE = 8 -_XFER_SIZE = 8 +_XFER_SIZE = 16 _XMM_SAVE_SIZE = 0 _INP_END = 0 diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S index 98d3c391da81..f833b74d902b 100644 --- a/arch/x86/crypto/sha256-ssse3-asm.S +++ b/arch/x86/crypto/sha256-ssse3-asm.S @@ -111,7 +111,7 @@ y2 = %r15d _INP_END_SIZE = 8 _INP_SIZE = 8 -_XFER_SIZE = 8 +_XFER_SIZE = 16 _XMM_SAVE_SIZE = 0 _INP_END = 0 |