diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-28 13:09:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-28 13:09:38 -0400 |
| commit | 30a9e501437e9319a90d66cd8e701f837deacc90 (patch) | |
| tree | f2bc8b1d517ece7520dae853e2a66f881b1e4838 | |
| parent | 320b34e3e067e08331725df122583afdca10f811 (diff) | |
| parent | de614e561b9c633073caae8f86399aa8923ef85d (diff) | |
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
| -rw-r--r-- | arch/x86/crypto/sha256-avx-asm.S | 2 | ||||
| -rw-r--r-- | arch/x86/crypto/sha256-ssse3-asm.S | 2 | ||||
| -rw-r--r-- | drivers/crypto/caam/caamalg.c | 4 |
3 files changed, 4 insertions, 4 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 | |||
| 118 | 118 | ||
| 119 | _INP_END_SIZE = 8 | 119 | _INP_END_SIZE = 8 |
| 120 | _INP_SIZE = 8 | 120 | _INP_SIZE = 8 |
| 121 | _XFER_SIZE = 8 | 121 | _XFER_SIZE = 16 |
| 122 | _XMM_SAVE_SIZE = 0 | 122 | _XMM_SAVE_SIZE = 0 |
| 123 | 123 | ||
| 124 | _INP_END = 0 | 124 | _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 | |||
| 111 | 111 | ||
| 112 | _INP_END_SIZE = 8 | 112 | _INP_END_SIZE = 8 |
| 113 | _INP_SIZE = 8 | 113 | _INP_SIZE = 8 |
| 114 | _XFER_SIZE = 8 | 114 | _XFER_SIZE = 16 |
| 115 | _XMM_SAVE_SIZE = 0 | 115 | _XMM_SAVE_SIZE = 0 |
| 116 | 116 | ||
| 117 | _INP_END = 0 | 117 | _INP_END = 0 |
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index 765fdf5ce579..bf416a8391a7 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c | |||
| @@ -1154,7 +1154,7 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req, | |||
| 1154 | dst_nents = sg_count(req->dst, req->cryptlen, &dst_chained); | 1154 | dst_nents = sg_count(req->dst, req->cryptlen, &dst_chained); |
| 1155 | 1155 | ||
| 1156 | sgc = dma_map_sg_chained(jrdev, req->assoc, assoc_nents ? : 1, | 1156 | sgc = dma_map_sg_chained(jrdev, req->assoc, assoc_nents ? : 1, |
| 1157 | DMA_BIDIRECTIONAL, assoc_chained); | 1157 | DMA_TO_DEVICE, assoc_chained); |
| 1158 | if (likely(req->src == req->dst)) { | 1158 | if (likely(req->src == req->dst)) { |
| 1159 | sgc = dma_map_sg_chained(jrdev, req->src, src_nents ? : 1, | 1159 | sgc = dma_map_sg_chained(jrdev, req->src, src_nents ? : 1, |
| 1160 | DMA_BIDIRECTIONAL, src_chained); | 1160 | DMA_BIDIRECTIONAL, src_chained); |
| @@ -1336,7 +1336,7 @@ static struct aead_edesc *aead_giv_edesc_alloc(struct aead_givcrypt_request | |||
| 1336 | dst_nents = sg_count(req->dst, req->cryptlen, &dst_chained); | 1336 | dst_nents = sg_count(req->dst, req->cryptlen, &dst_chained); |
| 1337 | 1337 | ||
| 1338 | sgc = dma_map_sg_chained(jrdev, req->assoc, assoc_nents ? : 1, | 1338 | sgc = dma_map_sg_chained(jrdev, req->assoc, assoc_nents ? : 1, |
| 1339 | DMA_BIDIRECTIONAL, assoc_chained); | 1339 | DMA_TO_DEVICE, assoc_chained); |
| 1340 | if (likely(req->src == req->dst)) { | 1340 | if (likely(req->src == req->dst)) { |
| 1341 | sgc = dma_map_sg_chained(jrdev, req->src, src_nents ? : 1, | 1341 | sgc = dma_map_sg_chained(jrdev, req->src, src_nents ? : 1, |
| 1342 | DMA_BIDIRECTIONAL, src_chained); | 1342 | DMA_BIDIRECTIONAL, src_chained); |