2016-04-26 07:29:49

by Marek Szyprowski

Subject: [PATCH] crypto: s5p-sss: fix incorrect usage of scatterlists api

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: <[email protected]>
Signed-off-by: Marek Szyprowski <[email protected]>
---
drivers/crypto/s5p-sss.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

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);
}
--
1.9.2

2016-04-26 07:45:32

by Krzysztof Kozlowski

Subject: Re: [PATCH] crypto: s5p-sss: fix incorrect usage of scatterlists api

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: <[email protected]>
> Signed-off-by: Marek Szyprowski <[email protected]>
> ---
> drivers/crypto/s5p-sss.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Krzysztof Kozlowski <[email protected]>

Best regards,
Krzysztof

2016-04-26 08:48:13

by Vladimir Zapolskiy

Subject: Re: [PATCH] crypto: s5p-sss: fix incorrect usage of scatterlists api

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: <[email protected]>
> Signed-off-by: Marek Szyprowski <[email protected]>

Acked-by: Vladimir Zapolskiy <[email protected]>

thank you for the fix.

--
With best wishes,
Vladimir

2016-04-28 01:21:43

by Herbert Xu

Subject: Re: [PATCH] crypto: s5p-sss: fix incorrect usage of scatterlists api

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: <[email protected]>
> Signed-off-by: Marek Szyprowski <[email protected]>

Applied.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt