]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
crypto: sahara - Fix dma unmap direction
authorMogens Lauridsen <mlauridsen171@gmail.com>
Thu, 3 Aug 2017 13:34:12 +0000 (15:34 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 17 Aug 2017 08:53:26 +0000 (16:53 +0800)
The direction used in dma_unmap_sg in aes calc is wrong.
This result in the cache not being invalidated correct when aes
calculation is done and result has been dma'ed to memory.
This is seen as sporadic wrong result from aes calc.

Signed-off-by: Mogens Lauridsen <mlauridsen171@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/sahara.c

index c2174ec88e2a860e64a668f17f4228f32ca09a54..474da36bdd2c786398305812e54713356a01ae34 100644 (file)
@@ -543,10 +543,10 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev)
 
 unmap_out:
        dma_unmap_sg(dev->device, dev->out_sg, dev->nb_out_sg,
-               DMA_TO_DEVICE);
+               DMA_FROM_DEVICE);
 unmap_in:
        dma_unmap_sg(dev->device, dev->in_sg, dev->nb_in_sg,
-               DMA_FROM_DEVICE);
+               DMA_TO_DEVICE);
 
        return -EINVAL;
 }
@@ -594,9 +594,9 @@ static int sahara_aes_process(struct ablkcipher_request *req)
        }
 
        dma_unmap_sg(dev->device, dev->out_sg, dev->nb_out_sg,
-               DMA_TO_DEVICE);
-       dma_unmap_sg(dev->device, dev->in_sg, dev->nb_in_sg,
                DMA_FROM_DEVICE);
+       dma_unmap_sg(dev->device, dev->in_sg, dev->nb_in_sg,
+               DMA_TO_DEVICE);
 
        return 0;
 }