crypto: caam - fix error path for ctx_dma mapping failure

commit 87ec02e7409d787348c244039aa3536a812dfa8b upstream.

In case ctx_dma dma mapping fails, ahash_unmap_ctx() tries to
dma unmap an invalid address:
map_seq_out_ptr_ctx() / ctx_map_to_sec4_sg() -> goto unmap_ctx ->
-> ahash_unmap_ctx() -> dma unmap ctx_dma

There is also possible to reach ahash_unmap_ctx() with ctx_dma
uninitialzed or to try to unmap the same address twice.

Fix these by setting ctx_dma = 0 where needed:
-initialize ctx_dma in ahash_init()
-clear ctx_dma in case of mapping error (instead of holding
the error code returned by the dma map function)
-clear ctx_dma after each unmapping

Fixes: 32686d34f8fb6 ("crypto: caam - ensure that we clean up after an error")
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
index 660dc206969f..2474f1494955 100644
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -154,6 +154,7 @@ static inline int map_seq_out_ptr_ctx(u32 *desc, struct device *jrdev,
                                         ctx_len, DMA_FROM_DEVICE);
         if (dma_mapping_error(jrdev, state->ctx_dma)) {
                 dev_err(jrdev, "unable to map ctx\n");
+                state->ctx_dma = 0;
                 return -ENOMEM;
         }
 
@@ -214,6 +215,7 @@ static inline int ctx_map_to_sec4_sg(u32 *desc, struct device *jrdev,
         state->ctx_dma = dma_map_single(jrdev, state->caam_ctx, ctx_len, flag);
         if (dma_mapping_error(jrdev, state->ctx_dma)) {
                 dev_err(jrdev, "unable to map ctx\n");
+                state->ctx_dma = 0;
                 return -ENOMEM;
         }
 
@@ -620,8 +622,10 @@ static inline void ahash_unmap_ctx(struct device *dev,
         struct caam_hash_ctx *ctx = crypto_ahash_ctx(ahash);
         struct caam_hash_state *state = ahash_request_ctx(req);
 
-        if (state->ctx_dma)
+        if (state->ctx_dma) {
                 dma_unmap_single(dev, state->ctx_dma, ctx->ctx_len, flag);
+                state->ctx_dma = 0;
+        }
         ahash_unmap(dev, edesc, req, dst_len);
 }
 
@@ -1605,6 +1609,7 @@ static int ahash_init(struct ahash_request *req)
         state->finup = ahash_finup_first;
         state->final = ahash_final_no_ctx;
 
+        state->ctx_dma = 0;
         state->current_buf = 0;
         state->buf_dma = 0;
         state->buflen_0 = 0;