| Message ID | 1461655766-27346-1-git-send-email-m.szyprowski@samsung.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
On 04/26/2016 09:29 AM, Marek Szyprowski wrote: > 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") > Cc: <stable@vger.kernel.org> > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > --- > drivers/crypto/s5p-sss.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Marek, On 26.04.2016 10:29, Marek Szyprowski wrote: > 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") > Cc: <stable@vger.kernel.org> > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Acked-by: Vladimir Zapolskiy <vz@mleia.com> thank you for the fix. -- With best wishes, Vladimir -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Apr 26, 2016 at 09:29:26AM +0200, Marek Szyprowski wrote: > 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") > Cc: <stable@vger.kernel.org> > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Applied.
diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c index ac6d62b..2b3a0cf 100644 --- a/drivers/crypto/s5p-sss.c +++ b/drivers/crypto/s5p-sss.c @@ -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); }
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") Cc: <stable@vger.kernel.org> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- drivers/crypto/s5p-sss.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)