This is a note to let you know that I've just added the patch titled
crypto: sun4i-ss - checking sg length is not sufficient
to the 5.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
crypto-sun4i-ss-checking-sg-length-is-not-sufficient.patch
and it can be found in the queue-5.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 7bdcd851fa7eb66e8922aa7f6cba9e2f2427a7cf Mon Sep 17 00:00:00 2001
From: Corentin Labbe <clabbe@xxxxxxxxxxxx>
Date: Mon, 14 Dec 2020 20:02:26 +0000
Subject: crypto: sun4i-ss - checking sg length is not sufficient
From: Corentin Labbe <clabbe@xxxxxxxxxxxx>
commit 7bdcd851fa7eb66e8922aa7f6cba9e2f2427a7cf upstream.
The optimized cipher function need length multiple of 4 bytes.
But it get sometimes odd length.
This is due to SG data could be stored with an offset.
So the fix is to check also if the offset is aligned with 4 bytes.
Fixes: 6298e948215f2 ("crypto: sunxi-ss - Add Allwinner Security System crypto accelerator")
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Corentin Labbe <clabbe@xxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c
+++ b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c
@@ -201,12 +201,12 @@ static int sun4i_ss_cipher_poll(struct s
* we can use the SS optimized function
*/
while (in_sg && no_chunk == 1) {
- if (in_sg->length % 4)
+ if ((in_sg->length | in_sg->offset) & 3u)
no_chunk = 0;
in_sg = sg_next(in_sg);
}
while (out_sg && no_chunk == 1) {
- if (out_sg->length % 4)
+ if ((out_sg->length | out_sg->offset) & 3u)
no_chunk = 0;
out_sg = sg_next(out_sg);
}
Patches currently in stable-queue which might be from clabbe@xxxxxxxxxxxx are
queue-5.11/crypto-sun4i-ss-initialize-need_fallback.patch
queue-5.11/crypto-sun4i-ss-iv-register-does-not-work-on-a10-and-a13.patch
queue-5.11/crypto-sun4i-ss-linearize-buffers-content-must-be-ke.patch
queue-5.11/crypto-sun4i-ss-handle-bigendian-for-cipher.patch
queue-5.11/crypto-sun4i-ss-fix-kmap-usage.patch
queue-5.11/crypto-sun4i-ss-checking-sg-length-is-not-sufficient.patch
