Skip to content

Commit 5281e6e

Browse files
tobluxgregkh
authored andcommitted
crypto: atmel-tdes - fix DMA sync direction
commit c8a9a64 upstream. Before DMA output is consumed by the CPU, ->dma_addr_out must be synced with dma_sync_single_for_cpu() instead of dma_sync_single_for_device(). Using the wrong direction can return stale cache data on non-coherent platforms. Fixes: 1380200 ("crypto: atmel - add Atmel DES/TDES driver") Fixes: 1f85804 ("crypto: atmel-tdes - add support for latest release of the IP (0x700)") Cc: stable@vger.kernel.org Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3061c9b commit 5281e6e

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/crypto/atmel-tdes.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ static int atmel_tdes_crypt_pdc_stop(struct atmel_tdes_dev *dd)
304304
dma_unmap_sg(dd->dev, dd->out_sg, 1, DMA_FROM_DEVICE);
305305
dma_unmap_sg(dd->dev, dd->in_sg, 1, DMA_TO_DEVICE);
306306
} else {
307-
dma_sync_single_for_device(dd->dev, dd->dma_addr_out,
308-
dd->dma_size, DMA_FROM_DEVICE);
307+
dma_sync_single_for_cpu(dd->dev, dd->dma_addr_out,
308+
dd->dma_size, DMA_FROM_DEVICE);
309309

310310
/* copy data */
311311
count = atmel_tdes_sg_copy(&dd->out_sg, &dd->out_offset,
@@ -655,8 +655,8 @@ static int atmel_tdes_crypt_dma_stop(struct atmel_tdes_dev *dd)
655655
dma_unmap_sg(dd->dev, dd->out_sg, 1, DMA_FROM_DEVICE);
656656
dma_unmap_sg(dd->dev, dd->in_sg, 1, DMA_TO_DEVICE);
657657
} else {
658-
dma_sync_single_for_device(dd->dev, dd->dma_addr_out,
659-
dd->dma_size, DMA_FROM_DEVICE);
658+
dma_sync_single_for_cpu(dd->dev, dd->dma_addr_out,
659+
dd->dma_size, DMA_FROM_DEVICE);
660660

661661
/* copy data */
662662
count = atmel_tdes_sg_copy(&dd->out_sg, &dd->out_offset,

0 commit comments

Comments
 (0)