[PATCH 4.14.y] crypto: tcrypt - fix S/G table for test_aead_speed()

[PATCH 4.14.y] crypto: tcrypt - fix S/G table for test_aead_speed()

[Horia Geantă]

From: Robert Baronescu <robert.baronescu@nxp.com>

commit 5c6ac1d4f8fbdbed65dbeb8cf149d736409d16a1 upstream.

In case buffer length is a multiple of PAGE_SIZE,
the S/G table is incorrectly generated.
Fix this by handling buflen = k * PAGE_SIZE separately.

Signed-off-by: Robert Baronescu <robert.baronescu@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
---
 crypto/tcrypt.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index f5f58a6eee5d..e339960dcac7 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -221,11 +221,13 @@ static void sg_init_aead(struct scatterlist *sg, char *xbuf[XBUFSIZE],
 	}
 
 	sg_init_table(sg, np + 1);
-	np--;
+	if (rem)
+		np--;
 	for (k = 0; k < np; k++)
 		sg_set_buf(&sg[k + 1], xbuf[k], PAGE_SIZE);
 
-	sg_set_buf(&sg[k + 1], xbuf[k], rem);
+	if (rem)
+		sg_set_buf(&sg[k + 1], xbuf[k], rem);
 }
 
 static void test_aead_speed(const char *algo, int enc, unsigned int secs,
-- 
2.12.0.264.gd6db3f216544

Re: [PATCH 4.14.y] crypto: tcrypt - fix S/G table for test_aead_speed()

[Greg Kroah-Hartman]

On Thu, Feb 08, 2018 at 09:28:31AM +0200, Horia Geantă wrote:
> From: Robert Baronescu <robert.baronescu@nxp.com>
> 
> commit 5c6ac1d4f8fbdbed65dbeb8cf149d736409d16a1 upstream.
> 
> In case buffer length is a multiple of PAGE_SIZE,
> the S/G table is incorrectly generated.
> Fix this by handling buflen = k * PAGE_SIZE separately.
> 
> Signed-off-by: Robert Baronescu <robert.baronescu@nxp.com>
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
> Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
> ---
>  crypto/tcrypt.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

Why just 4.14.y?  I also queued this up for everything else (4.15.y,
4.9.y, and 4.4.y).

thanks,

greg k-h

Re: [PATCH 4.14.y] crypto: tcrypt - fix S/G table for test_aead_speed()

[Horia Geantă]

On 2/8/2018 6:56 PM, Greg Kroah-Hartman wrote:
> On Thu, Feb 08, 2018 at 09:28:31AM +0200, Horia Geantă wrote:
>> From: Robert Baronescu <robert.baronescu@nxp.com>
>>
>> commit 5c6ac1d4f8fbdbed65dbeb8cf149d736409d16a1 upstream.
>>
>> In case buffer length is a multiple of PAGE_SIZE,
>> the S/G table is incorrectly generated.
>> Fix this by handling buflen = k * PAGE_SIZE separately.
>>
>> Signed-off-by: Robert Baronescu <robert.baronescu@nxp.com>
>> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
>> Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
>> ---
>>  crypto/tcrypt.c | 6 ++++--
>>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> Why just 4.14.y?  I also queued this up for everything else (4.15.y,
> 4.9.y, and 4.4.y).
> 
The issue is not observed unless upstream commit
7aacbfcb331c ("crypto: tcrypt - fix buffer lengths in test_aead_speed()")
is also applied.

Now I see it is already available on all stable branches that you mentioned, so
this is fine.

Thanks!
Horia

Re: [PATCH 4.14.y] crypto: tcrypt - fix S/G table for test_aead_speed()

[Greg Kroah-Hartman]

On Fri, Feb 09, 2018 at 06:11:59AM +0000, Horia Geantă wrote:
> On 2/8/2018 6:56 PM, Greg Kroah-Hartman wrote:
> > On Thu, Feb 08, 2018 at 09:28:31AM +0200, Horia Geantă wrote:
> >> From: Robert Baronescu <robert.baronescu@nxp.com>
> >>
> >> commit 5c6ac1d4f8fbdbed65dbeb8cf149d736409d16a1 upstream.
> >>
> >> In case buffer length is a multiple of PAGE_SIZE,
> >> the S/G table is incorrectly generated.
> >> Fix this by handling buflen = k * PAGE_SIZE separately.
> >>
> >> Signed-off-by: Robert Baronescu <robert.baronescu@nxp.com>
> >> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
> >> Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
> >> ---
> >>  crypto/tcrypt.c | 6 ++++--
> >>  1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > Why just 4.14.y?  I also queued this up for everything else (4.15.y,
> > 4.9.y, and 4.4.y).
> > 
> The issue is not observed unless upstream commit
> 7aacbfcb331c ("crypto: tcrypt - fix buffer lengths in test_aead_speed()")
> is also applied.

Shouldn't that patch also be applied to all of the stable trees?

thanks,

greg k-h

Re: [PATCH 4.14.y] crypto: tcrypt - fix S/G table for test_aead_speed()

[Horia Geantă]

On 2/9/2018 9:16 AM, Greg Kroah-Hartman wrote:
> On Fri, Feb 09, 2018 at 06:11:59AM +0000, Horia Geantă wrote:
>> On 2/8/2018 6:56 PM, Greg Kroah-Hartman wrote:
>>> On Thu, Feb 08, 2018 at 09:28:31AM +0200, Horia Geantă wrote:
>>>> From: Robert Baronescu <robert.baronescu@nxp.com>
>>>>
>>>> commit 5c6ac1d4f8fbdbed65dbeb8cf149d736409d16a1 upstream.
>>>>
>>>> In case buffer length is a multiple of PAGE_SIZE,
>>>> the S/G table is incorrectly generated.
>>>> Fix this by handling buflen = k * PAGE_SIZE separately.
>>>>
>>>> Signed-off-by: Robert Baronescu <robert.baronescu@nxp.com>
>>>> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
>>>> Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
>>>> ---
>>>>  crypto/tcrypt.c | 6 ++++--
>>>>  1 file changed, 4 insertions(+), 2 deletions(-)
>>>
>>> Why just 4.14.y?  I also queued this up for everything else (4.15.y,
>>> 4.9.y, and 4.4.y).
>>>
>> The issue is not observed unless upstream commit
>> 7aacbfcb331c ("crypto: tcrypt - fix buffer lengths in test_aead_speed()")
>> is also applied.
> 
> Shouldn't that patch also be applied to all of the stable trees?
> 
It has already been applied to 4.14.y, 4.9.y and 4.4.y stable trees.
For 4.15.y - no need to be applied (it got into 4.15 release).

Thanks,
Horia