* [PATCH 4.14.y] crypto: tcrypt - fix S/G table for test_aead_speed()
@ 2018-02-08 7:28 Horia Geantă
2018-02-08 16:56 ` Greg Kroah-Hartman
0 siblings, 1 reply; 5+ messages in thread
From: Horia Geantă @ 2018-02-08 7:28 UTC (permalink / raw)
To: stable; +Cc: Herbert Xu, Greg Kroah-Hartman
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 4.14.y] crypto: tcrypt - fix S/G table for test_aead_speed()
2018-02-08 7:28 [PATCH 4.14.y] crypto: tcrypt - fix S/G table for test_aead_speed() Horia Geantă
@ 2018-02-08 16:56 ` Greg Kroah-Hartman
2018-02-09 6:11 ` Horia Geantă
0 siblings, 1 reply; 5+ messages in thread
From: Greg Kroah-Hartman @ 2018-02-08 16:56 UTC (permalink / raw)
To: Horia Geantă; +Cc: stable, Herbert Xu
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 4.14.y] crypto: tcrypt - fix S/G table for test_aead_speed()
2018-02-08 16:56 ` Greg Kroah-Hartman
@ 2018-02-09 6:11 ` Horia Geantă
2018-02-09 7:16 ` Greg Kroah-Hartman
0 siblings, 1 reply; 5+ messages in thread
From: Horia Geantă @ 2018-02-09 6:11 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: stable, Herbert Xu
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 4.14.y] crypto: tcrypt - fix S/G table for test_aead_speed()
2018-02-09 6:11 ` Horia Geantă
@ 2018-02-09 7:16 ` Greg Kroah-Hartman
2018-02-09 7:39 ` Horia Geantă
0 siblings, 1 reply; 5+ messages in thread
From: Greg Kroah-Hartman @ 2018-02-09 7:16 UTC (permalink / raw)
To: Horia Geantă; +Cc: stable, Herbert Xu
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 4.14.y] crypto: tcrypt - fix S/G table for test_aead_speed()
2018-02-09 7:16 ` Greg Kroah-Hartman
@ 2018-02-09 7:39 ` Horia Geantă
0 siblings, 0 replies; 5+ messages in thread
From: Horia Geantă @ 2018-02-09 7:39 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: stable, Herbert Xu
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-02-09 7:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-08 7:28 [PATCH 4.14.y] crypto: tcrypt - fix S/G table for test_aead_speed() Horia Geantă
2018-02-08 16:56 ` Greg Kroah-Hartman
2018-02-09 6:11 ` Horia Geantă
2018-02-09 7:16 ` Greg Kroah-Hartman
2018-02-09 7:39 ` Horia Geantă
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.