[PATCH 5.0 012/238] crypto: caam - fix hash context DMA unmap size

[Greg Kroah-Hartman]

5.0-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Franck LENORMAND <franck.lenorm...@nxp.com>

commit 65055e2108847af5e577cc7ce6bde45ea136d29a upstream.

When driver started using state->caam_ctxt for storing both running hash
and final hash, it was not updated to handle different DMA unmap
lengths.

Cc: <sta...@vger.kernel.org> # v4.19+
Fixes: c19650d6ea99 ("crypto: caam - fix DMA mapping of stack memory")
Signed-off-by: Franck LENORMAND <franck.lenorm...@nxp.com>
Signed-off-by: Horia Geantă <horia.gea...@nxp.com>
Signed-off-by: Herbert Xu <herb...@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/crypto/caam/caamhash.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -113,6 +113,7 @@ struct caam_hash_ctx {
 struct caam_hash_state {
        dma_addr_t buf_dma;
        dma_addr_t ctx_dma;
+       int ctx_dma_len;
        u8 buf_0[CAAM_MAX_HASH_BLOCK_SIZE] ____cacheline_aligned;
        int buflen_0;
        u8 buf_1[CAAM_MAX_HASH_BLOCK_SIZE] ____cacheline_aligned;
@@ -165,6 +166,7 @@ static inline int map_seq_out_ptr_ctx(u3
                                      struct caam_hash_state *state,
                                      int ctx_len)
 {
+       state->ctx_dma_len = ctx_len;
        state->ctx_dma = dma_map_single(jrdev, state->caam_ctx,
                                        ctx_len, DMA_FROM_DEVICE);
        if (dma_mapping_error(jrdev, state->ctx_dma)) {
@@ -218,6 +220,7 @@ static inline int ctx_map_to_sec4_sg(str
                                     struct caam_hash_state *state, int ctx_len,
                                     struct sec4_sg_entry *sec4_sg, u32 flag)
 {
+       state->ctx_dma_len = ctx_len;
        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");
@@ -468,12 +471,10 @@ static inline void ahash_unmap_ctx(struc
                        struct ahash_edesc *edesc,
                        struct ahash_request *req, int dst_len, u32 flag)
 {
-       struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);
-       struct caam_hash_ctx *ctx = crypto_ahash_ctx(ahash);
        struct caam_hash_state *state = ahash_request_ctx(req);
 
        if (state->ctx_dma) {
-               dma_unmap_single(dev, state->ctx_dma, ctx->ctx_len, flag);
+               dma_unmap_single(dev, state->ctx_dma, state->ctx_dma_len, flag);
                state->ctx_dma = 0;
        }
        ahash_unmap(dev, edesc, req, dst_len);
@@ -1446,6 +1447,7 @@ static int ahash_init(struct ahash_reque
        state->final = ahash_final_no_ctx;
 
        state->ctx_dma = 0;
+       state->ctx_dma_len = 0;
        state->current_buf = 0;
        state->buf_dma = 0;
        state->buflen_0 = 0;