* [PATCH] crypto: s5p-sss: fix incorrect usage of scatterlists api
@ 2016-04-26 7:29 Marek Szyprowski
2016-04-26 7:45 ` Krzysztof Kozlowski
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Marek Szyprowski @ 2016-04-26 7:29 UTC (permalink / raw)
To: linux-crypto, linux-samsung-soc
Cc: Marek Szyprowski, Krzysztof Kozlowski, Herbert Xu,
David S. Miller, Vladimir Zapolskiy, Bartlomiej Zolnierkiewicz,
stable
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(-)
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] crypto: s5p-sss: fix incorrect usage of scatterlists api
2016-04-26 7:29 [PATCH] crypto: s5p-sss: fix incorrect usage of scatterlists api Marek Szyprowski
@ 2016-04-26 7:45 ` Krzysztof Kozlowski
2016-04-26 8:48 ` Vladimir Zapolskiy
2016-04-28 1:21 ` Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2016-04-26 7:45 UTC (permalink / raw)
To: Marek Szyprowski, linux-crypto, linux-samsung-soc
Cc: Herbert Xu, David S. Miller, Vladimir Zapolskiy,
Bartlomiej Zolnierkiewicz, stable
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] crypto: s5p-sss: fix incorrect usage of scatterlists api
2016-04-26 7:29 [PATCH] crypto: s5p-sss: fix incorrect usage of scatterlists api Marek Szyprowski
2016-04-26 7:45 ` Krzysztof Kozlowski
@ 2016-04-26 8:48 ` Vladimir Zapolskiy
2016-04-28 1:21 ` Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Vladimir Zapolskiy @ 2016-04-26 8:48 UTC (permalink / raw)
To: Marek Szyprowski, linux-crypto, linux-samsung-soc
Cc: Krzysztof Kozlowski, Herbert Xu, David S. Miller,
Bartlomiej Zolnierkiewicz, stable
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] crypto: s5p-sss: fix incorrect usage of scatterlists api
2016-04-26 7:29 [PATCH] crypto: s5p-sss: fix incorrect usage of scatterlists api Marek Szyprowski
2016-04-26 7:45 ` Krzysztof Kozlowski
2016-04-26 8:48 ` Vladimir Zapolskiy
@ 2016-04-28 1:21 ` Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Herbert Xu @ 2016-04-28 1:21 UTC (permalink / raw)
To: Marek Szyprowski
Cc: linux-crypto, linux-samsung-soc, Krzysztof Kozlowski,
David S. Miller, Vladimir Zapolskiy, Bartlomiej Zolnierkiewicz,
stable
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.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-04-28 1:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-26 7:29 [PATCH] crypto: s5p-sss: fix incorrect usage of scatterlists api Marek Szyprowski
2016-04-26 7:45 ` Krzysztof Kozlowski
2016-04-26 8:48 ` Vladimir Zapolskiy
2016-04-28 1:21 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).