All of lore.kernel.org
 help / color / mirror / Atom feed
From: Antoine Tenart <antoine.tenart@bootlin.com>
To: herbert@gondor.apana.org.au, davem@davemloft.net
Cc: Antoine Tenart <antoine.tenart@bootlin.com>,
	thomas.petazzoni@bootlin.com, gregory.clement@bootlin.com,
	miquel.raynal@bootlin.com, oferh@marvell.com, igall@marvell.com,
	nadavh@marvell.com, linux-crypto@vger.kernel.org
Subject: [PATCH 8/8] crypto: inside-secure - unmap the result in the hash send error path
Date: Tue, 13 Feb 2018 09:26:57 +0100	[thread overview]
Message-ID: <20180213082657.4759-9-antoine.tenart@bootlin.com> (raw)
In-Reply-To: <20180213082657.4759-1-antoine.tenart@bootlin.com>

This patch adds a label to unmap the result buffer in the hash send
function error path.

Fixes: 1b44c5a60c13 ("crypto: inside-secure - add SafeXcel EIP197 crypto engine driver")
Suggested-by: Ofer Heifetz <oferh@marvell.com>
Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
---
 drivers/crypto/inside-secure/safexcel_hash.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/inside-secure/safexcel_hash.c b/drivers/crypto/inside-secure/safexcel_hash.c
index 43e94cd59c86..a4960a934eef 100644
--- a/drivers/crypto/inside-secure/safexcel_hash.c
+++ b/drivers/crypto/inside-secure/safexcel_hash.c
@@ -303,7 +303,7 @@ static int safexcel_ahash_send_req(struct crypto_async_request *async, int ring,
 				   req->state_sz);
 	if (IS_ERR(rdesc)) {
 		ret = PTR_ERR(rdesc);
-		goto cdesc_rollback;
+		goto unmap_result;
 	}
 
 	spin_unlock_bh(&priv->ring[ring].egress_lock);
@@ -315,6 +315,8 @@ static int safexcel_ahash_send_req(struct crypto_async_request *async, int ring,
 	*results = 1;
 	return 0;
 
+unmap_result:
+	dma_unmap_sg(priv->dev, areq->src, req->nents, DMA_TO_DEVICE);
 cdesc_rollback:
 	for (i = 0; i < n_cdesc; i++)
 		safexcel_ring_rollback_wptr(priv, &priv->ring[ring].cdr);
-- 
2.14.3

      parent reply	other threads:[~2018-02-13  8:30 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-13  8:26 [PATCH 0/8] crypto: inside-secure - stabilization and fixes Antoine Tenart
2018-02-13  8:26 ` [PATCH 1/8] MAINTAINERS: update the Inside Secure maintainer email Antoine Tenart
2018-02-13  8:26 ` [PATCH 2/8] crypto: inside-secure - do not overwrite the threshold value Antoine Tenart
2018-02-13  8:26 ` [PATCH 3/8] crypto: inside-secure - fix the extra cache computation Antoine Tenart
2018-02-13  8:26 ` [PATCH 4/8] crypto: inside-secure - fix the cache_len computation Antoine Tenart
2018-02-13  8:26 ` [PATCH 5/8] crypto: inside-secure - do not process request if no command was issued Antoine Tenart
2018-02-13  8:26 ` [PATCH 6/8] crypto: inside-secure - fix the invalidation step during cra_exit Antoine Tenart
2018-02-13  8:26 ` [PATCH 7/8] crypto: inside-secure - keep the requests push/pop synced Antoine Tenart
2018-02-13  8:26 ` Antoine Tenart [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180213082657.4759-9-antoine.tenart@bootlin.com \
    --to=antoine.tenart@bootlin.com \
    --cc=davem@davemloft.net \
    --cc=gregory.clement@bootlin.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=igall@marvell.com \
    --cc=linux-crypto@vger.kernel.org \
    --cc=miquel.raynal@bootlin.com \
    --cc=nadavh@marvell.com \
    --cc=oferh@marvell.com \
    --cc=thomas.petazzoni@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.