crypto: sun4i-ss - checking sg length is not sufficient

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@vger.kernel.org>
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
index 178096e4e77da4facc2e12cb5b61e284ddc8ec13..5a5bd6ee535e6b47ed52b8334233b60aea6a11dd 100644 (file)
--- a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
+++ b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
@@ -189,12 +189,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);
        }