crypto: inside-secure - do not access buffers mapped to the device
authorAntoine Tenart <antoine.tenart@bootlin.com>
Mon, 19 Mar 2018 08:21:17 +0000 (09:21 +0100)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 30 Mar 2018 17:32:45 +0000 (01:32 +0800)
This patches update the way the digest is copied from the state buffer
to the result buffer, so that the copy only happen after the state
buffer was DMA unmapped, as otherwise the buffer would be owned by the
device.

Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/inside-secure/safexcel_hash.c

index ee4caf34c5a7be93070e47d6e94b7e6929d2c95d..d3ba935d02664ac8834e8cc374e39a4dd083c65a 100644 (file)
@@ -156,10 +156,6 @@ static int safexcel_handle_req_result(struct safexcel_crypto_priv *priv, int rin
        safexcel_complete(priv, ring);
        spin_unlock_bh(&priv->ring[ring].egress_lock);
 
-       if (sreq->finish)
-               memcpy(areq->result, sreq->state,
-                      crypto_ahash_digestsize(ahash));
-
        if (sreq->nents) {
                dma_unmap_sg(priv->dev, areq->src, sreq->nents, DMA_TO_DEVICE);
                sreq->nents = 0;
@@ -177,6 +173,10 @@ static int safexcel_handle_req_result(struct safexcel_crypto_priv *priv, int rin
                sreq->cache_dma = 0;
        }
 
+       if (sreq->finish)
+               memcpy(areq->result, sreq->state,
+                      crypto_ahash_digestsize(ahash));
+
        cache_len = sreq->len - sreq->processed;
        if (cache_len)
                memcpy(sreq->cache, sreq->cache_next, cache_len);