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

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

crypto: inside-secure - do not access buffers mapped to the device 



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: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 57433b58

drivers/crypto/inside-secure/safexcel_hash.c

+4 −4
Original line number Diff line number Diff line
@@ -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);