crypto: s5p-sss - fix incorrect usage of scatterlists api
authorMarek Szyprowski <m.szyprowski@samsung.com>
Tue, 26 Apr 2016 07:29:26 +0000 (09:29 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 28 Apr 2016 01:15:50 +0000 (09:15 +0800)
sg_dma_len() macro can be used only on scattelists which are mapped, so
all calls to it before dma_map_sg() are invalid. Replace them by proper
check for direct sg segment length read.

Fixes: a49e490c7a8a ("crypto: s5p-sss - add S5PV210 advanced crypto engine support")
Fixes: 9e4a1100a445 ("crypto: s5p-sss - Handle unaligned buffers")
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/s5p-sss.c

index ac6d62b3be071aacf054b8a346219f67d52560dc..2b3a0cfe3331577b2fb12733bafea71bbc59375e 100644 (file)
@@ -327,7 +327,7 @@ static int s5p_set_outdata(struct s5p_aes_dev *dev, struct scatterlist *sg)
 {
        int err;
 
-       if (!sg_dma_len(sg)) {
+       if (!sg->length) {
                err = -EINVAL;
                goto exit;
        }
@@ -349,7 +349,7 @@ static int s5p_set_indata(struct s5p_aes_dev *dev, struct scatterlist *sg)
 {
        int err;
 
-       if (!sg_dma_len(sg)) {
+       if (!sg->length) {
                err = -EINVAL;
                goto exit;
        }
@@ -474,7 +474,7 @@ static void s5p_set_aes(struct s5p_aes_dev *dev,
 static bool s5p_is_sg_aligned(struct scatterlist *sg)
 {
        while (sg) {
-               if (!IS_ALIGNED(sg_dma_len(sg), AES_BLOCK_SIZE))
+               if (!IS_ALIGNED(sg->length, AES_BLOCK_SIZE))
                        return false;
                sg = sg_next(sg);
        }