crypto: atmel-tdes - use scatterlist length before DMA mapping
Subsystems (3)
PATCH 1/1 crypto: atmel-tdes - use scatterlist length before DMA mapping
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.
--- drivers/crypto/atmel-tdes.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/crypto/atmel-tdes.c +3 -3
@@ -463,14 +463,14 @@ 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); + count =min_t (size_t, count, dd->out_sg->length); err =dma_map_sg (dd->dev, dd->in_sg,1 ,DMA_TO_DEVICE );if (!err) {
Herbert Xu
maintainerQuoted 24 lines · Thorsten Blum
Using
sg_dma_len()is only valid after mapping the scatterlist withdma_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.Fixes 13802005d8f2 ("crypto: atmel - add Atmel DES/TDES driver")Fixes 1f858040c2f7 ("crypto: atmel-tdes - add support for latest release of the IP (0x700)")Signed-off-by Thorsten Blum <[email protected]>--- drivers/crypto/atmel-tdes.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/crypto/atmel-tdes.c +0
-1@@ -463,14 +463,14 @@ 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))
drivers/crypto/atmel-tdes.c static int atmel_tdes_crypt_start(struct atmel_tdes_dev *dd) · line 473
Quoted 10 lines
drivers/crypto/atmel-tdes.c +3
-2+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); + count =min_t (size_t, count, dd->out_sg->length);
If fast == 1, then dd->in_sg->length must be equal to dd->out_sg->length, so the second line is redundant.
Cheers,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt