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

Commit e82d07d5 authored by Ovidiu Panait's avatar Ovidiu Panait Committed by Greg Kroah-Hartman
Browse files

crypto: sahara - fix processing requests with cryptlen < sg->length 



[ Upstream commit 5b8668ce3452827d27f8c34ff6ba080a8f983ed0 ]

It's not always the case that the entire sg entry needs to be processed.
Currently, when cryptlen is less than sg->legth, "Descriptor length" errors
are encountered.

The error was noticed when testing xts(sahara-ecb-aes) with arbitrary sized
input data. To fix this, take the actual request size into account when
populating the hw links.

Fixes: 5de88752 ("crypto: sahara - Add driver for SAHARA2 accelerator.")
Signed-off-by: default avatarOvidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent da43c262

drivers/crypto/sahara.c

+7 −2
Original line number Diff line number Diff line
@@ -442,6 +442,7 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev) 
	int ret;

	int i, j;

	int idx = 0;

	u32 len;



	memcpy(dev->key_base, ctx->key, ctx->keylen);
@@ -492,12 +493,14 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev) 
	/* Create input links */

	dev->hw_desc[idx]->p1 = dev->hw_phys_link[0];

	sg = dev->in_sg;

	len = dev->total;

	for (i = 0; i < dev->nb_in_sg; i++) {

		dev->hw_link[i]->len = sg->length;

		dev->hw_link[i]->len = min(len, sg->length);

		dev->hw_link[i]->p = sg->dma_address;

		if (i == (dev->nb_in_sg - 1)) {

			dev->hw_link[i]->next = 0;

		} else {

			len -= min(len, sg->length);

			dev->hw_link[i]->next = dev->hw_phys_link[i + 1];

			sg = sg_next(sg);

		}
@@ -506,12 +509,14 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev) 
	/* Create output links */

	dev->hw_desc[idx]->p2 = dev->hw_phys_link[i];

	sg = dev->out_sg;

	len = dev->total;

	for (j = i; j < dev->nb_out_sg + i; j++) {

		dev->hw_link[j]->len = sg->length;

		dev->hw_link[j]->len = min(len, sg->length);

		dev->hw_link[j]->p = sg->dma_address;

		if (j == (dev->nb_out_sg + i - 1)) {

			dev->hw_link[j]->next = 0;

		} else {

			len -= min(len, sg->length);

			dev->hw_link[j]->next = dev->hw_phys_link[j + 1];

			sg = sg_next(sg);

		}