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: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/inside-secure/safexcel_hash.c b/drivers/crypto/inside-secure/safexcel_hash.c
index 955b25ebffee4977ef8af6c314b0610583e119a1..ee4caf34c5a7be93070e47d6e94b7e6929d2c95d 100644 (file)
--- a/drivers/crypto/inside-secure/safexcel_hash.c
+++ b/drivers/crypto/inside-secure/safexcel_hash.c
@@ -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 @@ send_command:
                                         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 @@ send_command:
        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++)