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

Commit 57433b58 authored by Antoine Tenart's avatar Antoine Tenart Committed by Herbert Xu
Browse files

crypto: inside-secure - improve the send error path 



This patch improves the send error path as it wasn't handling all error
cases. A new label is added, and some of the goto are updated to point
to the right labels, so that the code is more robust to errors.

Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent d9107087

drivers/crypto/inside-secure/safexcel_hash.c

+5 −2
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static int safexcel_ahash_send_req(struct crypto_async_request *async, int ring, 
					   sglen, len, ctx->base.ctxr_dma);

		if (IS_ERR(cdesc)) {

			ret = PTR_ERR(cdesc);

			goto cdesc_rollback;

			goto unmap_sg;

		}

		n_cdesc++;
@@ -305,7 +305,7 @@ static int safexcel_ahash_send_req(struct crypto_async_request *async, int ring, 
					 DMA_FROM_DEVICE);

	if (dma_mapping_error(priv->dev, req->result_dma)) {

		ret = -EINVAL;

		goto cdesc_rollback;

		goto unmap_sg;

	}



	/* Add a result descriptor */
@@ -326,6 +326,9 @@ static int safexcel_ahash_send_req(struct crypto_async_request *async, int ring, 
	return 0;



unmap_result:

	dma_unmap_single(priv->dev, req->result_dma, req->state_sz,

			 DMA_FROM_DEVICE);

unmap_sg:

	dma_unmap_sg(priv->dev, areq->src, req->nents, DMA_TO_DEVICE);

cdesc_rollback:

	for (i = 0; i < n_cdesc; i++)