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

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

crypto: sahara - fix processing hash requests with req->nbytes < sg->length 



[ Upstream commit 7bafa74d1ba35dcc173e1ce915e983d65905f77e ]

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

To fix this, take the actual request size into account when populating the
hw links.

Fixes: 5a2bb93f ("crypto: sahara - add support for SHA1/256")
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 ba1ef427

drivers/crypto/sahara.c

+4 −1
Original line number Diff line number Diff line
@@ -792,6 +792,7 @@ static int sahara_sha_hw_links_create(struct sahara_dev *dev, 
				       int start)

{

	struct scatterlist *sg;

	unsigned int len;

	unsigned int i;

	int ret;
@@ -813,12 +814,14 @@ static int sahara_sha_hw_links_create(struct sahara_dev *dev, 
	if (!ret)

		return -EFAULT;



	len = rctx->total;

	for (i = start; i < dev->nb_in_sg + start; 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 + start - 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);

		}