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>

diff --git a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c
index 19f1aa577ed4d6c2ee5e401482ce38c57742fd71..f49797588329b0be6651645b2eb5f837972667ac 100644 (file)
--- 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);
        }