Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30a9e501 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 320b34e3 de614e56

arch/x86/crypto/sha256-avx-asm.S

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/x86/crypto/sha256-ssse3-asm.S

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/crypto/caam/caamalg.c

+2 −2
Original line number Diff line number Diff line
@@ -1154,7 +1154,7 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req, 
		dst_nents = sg_count(req->dst, req->cryptlen, &dst_chained);



	sgc = dma_map_sg_chained(jrdev, req->assoc, assoc_nents ? : 1,

				 DMA_BIDIRECTIONAL, assoc_chained);

				 DMA_TO_DEVICE, assoc_chained);

	if (likely(req->src == req->dst)) {

		sgc = dma_map_sg_chained(jrdev, req->src, src_nents ? : 1,

					 DMA_BIDIRECTIONAL, src_chained);
@@ -1336,7 +1336,7 @@ static struct aead_edesc *aead_giv_edesc_alloc(struct aead_givcrypt_request 
		dst_nents = sg_count(req->dst, req->cryptlen, &dst_chained);



	sgc = dma_map_sg_chained(jrdev, req->assoc, assoc_nents ? : 1,

				 DMA_BIDIRECTIONAL, assoc_chained);

				 DMA_TO_DEVICE, assoc_chained);

	if (likely(req->src == req->dst)) {

		sgc = dma_map_sg_chained(jrdev, req->src, src_nents ? : 1,

					 DMA_BIDIRECTIONAL, src_chained);