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

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

crypto: sahara - fix error handling in sahara_hw_descriptor_create() 



[ Upstream commit ee6e6f0a7f5b39d50a5ef5fcc006f4f693db18a7 ]

Do not call dma_unmap_sg() for scatterlists that were not mapped
successfully.

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 e82d07d5

drivers/crypto/sahara.c

+3 −5
Original line number Diff line number Diff line
@@ -481,13 +481,14 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev) 
			 DMA_TO_DEVICE);

	if (ret != dev->nb_in_sg) {

		dev_err(dev->device, "couldn't map in sg\n");

		goto unmap_in;

		return -EINVAL;

	}



	ret = dma_map_sg(dev->device, dev->out_sg, dev->nb_out_sg,

			 DMA_FROM_DEVICE);

	if (ret != dev->nb_out_sg) {

		dev_err(dev->device, "couldn't map out sg\n");

		goto unmap_out;

		goto unmap_in;

	}



	/* Create input links */
@@ -535,9 +536,6 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev) 


	return 0;



unmap_out:

	dma_unmap_sg(dev->device, dev->out_sg, dev->nb_out_sg,

		DMA_FROM_DEVICE);

unmap_in:

	dma_unmap_sg(dev->device, dev->in_sg, dev->nb_in_sg,

		DMA_TO_DEVICE);