| Message ID | 1469195184-4700-1-git-send-email-romain.perier@free-electrons.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, 22 Jul 2016 15:46:24 +0200 Romain Perier <romain.perier@free-electrons.com> wrote: > So far, the cache of the ahash requests was updated from the 'complete' > operation. This complete operation is called from mv_cesa_tdma_process > before the cleanup operation, which means that the content of req->src > can be read and copied when it is still mapped. This commit fixes the > issue by moving this cache update from mv_cesa_ahash_complete to > mv_cesa_ahash_req_cleanup, so the copy is done once the sglist is > unmapped. > > Fixes: 1bf6682cb31d ("crypto: marvell - Add a complete operation for..") > Signed-off-by: Romain Perier <romain.perier@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> > --- > drivers/crypto/marvell/hash.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/crypto/marvell/hash.c b/drivers/crypto/marvell/hash.c > index c35912b..82e0f4e6 100644 > --- a/drivers/crypto/marvell/hash.c > +++ b/drivers/crypto/marvell/hash.c > @@ -315,12 +315,6 @@ static void mv_cesa_ahash_complete(struct crypto_async_request *req) > for (i = 0; i < digsize / 4; i++) > creq->state[i] = readl_relaxed(engine->regs + CESA_IVDIG(i)); > > - if (creq->cache_ptr) > - sg_pcopy_to_buffer(ahashreq->src, creq->src_nents, > - creq->cache, > - creq->cache_ptr, > - ahashreq->nbytes - creq->cache_ptr); > - > if (creq->last_req) { > /* > * Hardware's MD5 digest is in little endian format, but > @@ -365,6 +359,12 @@ static void mv_cesa_ahash_req_cleanup(struct crypto_async_request *req) > mv_cesa_ahash_last_cleanup(ahashreq); > > mv_cesa_ahash_cleanup(ahashreq); > + > + if (creq->cache_ptr) > + sg_pcopy_to_buffer(ahashreq->src, creq->src_nents, > + creq->cache, > + creq->cache_ptr, > + ahashreq->nbytes - creq->cache_ptr); > } > > static const struct mv_cesa_req_ops mv_cesa_ahash_req_ops = { -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Romain Perier <romain.perier@free-electrons.com> wrote: > So far, the cache of the ahash requests was updated from the 'complete' > operation. This complete operation is called from mv_cesa_tdma_process > before the cleanup operation, which means that the content of req->src > can be read and copied when it is still mapped. This commit fixes the > issue by moving this cache update from mv_cesa_ahash_complete to > mv_cesa_ahash_req_cleanup, so the copy is done once the sglist is > unmapped. > > Fixes: 1bf6682cb31d ("crypto: marvell - Add a complete operation for..") > Signed-off-by: Romain Perier <romain.perier@free-electrons.com> Patch applied. Thanks.
diff --git a/drivers/crypto/marvell/hash.c b/drivers/crypto/marvell/hash.c index c35912b..82e0f4e6 100644 --- a/drivers/crypto/marvell/hash.c +++ b/drivers/crypto/marvell/hash.c @@ -315,12 +315,6 @@ static void mv_cesa_ahash_complete(struct crypto_async_request *req) for (i = 0; i < digsize / 4; i++) creq->state[i] = readl_relaxed(engine->regs + CESA_IVDIG(i)); - if (creq->cache_ptr) - sg_pcopy_to_buffer(ahashreq->src, creq->src_nents, - creq->cache, - creq->cache_ptr, - ahashreq->nbytes - creq->cache_ptr); - if (creq->last_req) { /* * Hardware's MD5 digest is in little endian format, but @@ -365,6 +359,12 @@ static void mv_cesa_ahash_req_cleanup(struct crypto_async_request *req) mv_cesa_ahash_last_cleanup(ahashreq); mv_cesa_ahash_cleanup(ahashreq); + + if (creq->cache_ptr) + sg_pcopy_to_buffer(ahashreq->src, creq->src_nents, + creq->cache, + creq->cache_ptr, + ahashreq->nbytes - creq->cache_ptr); } static const struct mv_cesa_req_ops mv_cesa_ahash_req_ops = {
So far, the cache of the ahash requests was updated from the 'complete' operation. This complete operation is called from mv_cesa_tdma_process before the cleanup operation, which means that the content of req->src can be read and copied when it is still mapped. This commit fixes the issue by moving this cache update from mv_cesa_ahash_complete to mv_cesa_ahash_req_cleanup, so the copy is done once the sglist is unmapped. Fixes: 1bf6682cb31d ("crypto: marvell - Add a complete operation for..") Signed-off-by: Romain Perier <romain.perier@free-electrons.com> --- drivers/crypto/marvell/hash.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)