From: Corentin Labbe
> Sent: 16 November 2020 13:54
>
> 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>
> ---
> drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c | 4 ++--
> 1 file 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..4dd736ee5a4d 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 % 4 || !IS_ALIGNED(in_sg->offset, sizeof(u32)))
You probably ought to do the test in a consistent manner.
Probably something that reduces to:
((unsigned long)in_sg->offset | in_sg->length) & 3u
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)
