Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c18f773 authored by Corentin Labbe's avatar Corentin Labbe Committed by Greg Kroah-Hartman
Browse files

crypto: sun4i-ss - handle BigEndian for cipher 



commit 5ab6177fa02df15cd8a02a1f1fb361d2d5d8b946 upstream.

Ciphers produce invalid results on BE.
Key and IV need to be written in LE.

Fixes: 6298e948 ("crypto: sunxi-ss - Add Allwinner Security System crypto accelerator")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9819913f

drivers/crypto/sunxi-ss/sun4i-ss-cipher.c

+6 −6
Original line number Diff line number Diff line
@@ -55,13 +55,13 @@ static int sun4i_ss_opti_poll(struct skcipher_request *areq) 


	spin_lock_irqsave(&ss->slock, flags);



	for (i = 0; i < op->keylen; i += 4)

		writel(*(op->key + i / 4), ss->base + SS_KEY0 + i);

	for (i = 0; i < op->keylen / 4; i++)

		writesl(ss->base + SS_KEY0 + i * 4, &op->key[i], 1);



	if (areq->iv) {

		for (i = 0; i < 4 && i < ivsize / 4; i++) {

			v = *(u32 *)(areq->iv + i * 4);

			writel(v, ss->base + SS_IV0 + i * 4);

			writesl(ss->base + SS_IV0 + i * 4, &v, 1);

		}

	}

	writel(mode, ss->base + SS_CTL);
@@ -204,13 +204,13 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq) 


	spin_lock_irqsave(&ss->slock, flags);



	for (i = 0; i < op->keylen; i += 4)

		writel(*(op->key + i / 4), ss->base + SS_KEY0 + i);

	for (i = 0; i < op->keylen / 4; i++)

		writesl(ss->base + SS_KEY0 + i * 4, &op->key[i], 1);



	if (areq->iv) {

		for (i = 0; i < 4 && i < ivsize / 4; i++) {

			v = *(u32 *)(areq->iv + i * 4);

			writel(v, ss->base + SS_IV0 + i * 4);

			writesl(ss->base + SS_IV0 + i * 4, &v, 1);

		}

	}

	writel(mode, ss->base + SS_CTL);