crypto: atmel-tdes - use scatterlist length before DMA mapping

commit ba199bdaa80b09a7dd92f28751de7f3dbb06c510 upstream.

Using sg_dma_len() is only valid after mapping the scatterlist with
dma_map_sg(). However, atmel_tdes_crypt_start() uses it before mapping
to compare input/output lengths and to compute the transfer count.

Use the original scatterlist lengths before DMA mapping to avoid reading
stale or uninitialized DMA lengths when CONFIG_NEED_SG_DMA_LENGTH=y.

Drop the output scatterlist length in the fast path since it is equal to
->in_sg->length and does not change the transfer count.

Fixes: 13802005d8f2 ("crypto: atmel - add Atmel DES/TDES driver")
Fixes: 1f858040c2f7 ("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>

diff --git a/drivers/crypto/atmel-tdes.c b/drivers/crypto/atmel-tdes.c
index 643e507f9c020907695ddd399500f7f93061e3a8..d380f6741a2c5a50b3d27e7b5134d9d307e5959c 100644 (file)
--- a/drivers/crypto/atmel-tdes.c
+++ b/drivers/crypto/atmel-tdes.c
@@ -463,14 +463,13 @@ static int atmel_tdes_crypt_start(struct atmel_tdes_dev *dd)
                        IS_ALIGNED(dd->out_sg->length, dd->ctx->block_size);
                fast = in && out;
 
-               if (sg_dma_len(dd->in_sg) != sg_dma_len(dd->out_sg))
+               if (dd->in_sg->length != dd->out_sg->length)
                        fast = 0;
        }
 
 
        if (fast)  {
-               count = min_t(size_t, dd->total, sg_dma_len(dd->in_sg));
-               count = min_t(size_t, count, sg_dma_len(dd->out_sg));
+               count = min_t(size_t, dd->total, dd->in_sg->length);
 
                err = dma_map_sg(dd->dev, dd->in_sg, 1, DMA_TO_DEVICE);
                if (!err) {