summaryrefslogtreecommitdiffstats
path: root/drivers/crypto/allwinner
diff options
context:
space:
mode:
authorCorentin Labbe <clabbe@baylibre.com>2020-12-14 20:02:26 +0000
committerHerbert Xu <herbert@gondor.apana.org.au>2021-01-03 08:41:35 +1100
commit7bdcd851fa7eb66e8922aa7f6cba9e2f2427a7cf (patch)
tree0150651ff76713e9d79697dca32e8c88a0b5d2a4 /drivers/crypto/allwinner
parent583513510a7acd2306787865bcd19ebb2f629d42 (diff)
downloadlinux-stable-7bdcd851fa7eb66e8922aa7f6cba9e2f2427a7cf.tar.gz
linux-stable-7bdcd851fa7eb66e8922aa7f6cba9e2f2427a7cf.tar.bz2
linux-stable-7bdcd851fa7eb66e8922aa7f6cba9e2f2427a7cf.zip
crypto: sun4i-ss - checking sg length is not sufficient
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@vger.kernel.org> Signed-off-by: Corentin Labbe <clabbe@baylibre.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/allwinner')
-rw-r--r--drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c
index 19f1aa577ed4..f49797588329 100644
--- a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c
+++ b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c
@@ -186,12 +186,12 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)
* 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);
}