diff options
| author | Aymen Sghaier <aymen.sghaier@nxp.com> | 2018-06-26 15:46:43 +0200 |
|---|---|---|
| committer | Aymen Sghaier <aymen.sghaier@nxp.com> | 2018-06-26 16:02:46 +0200 |
| commit | 05f46d3f9b4a8987edac62a52528d52f47cfa42d (patch) | |
| tree | e685d4ba0b4e6e292b44c844863d95f0bf3e6a37 | |
| parent | a1c964f59d145d596db05765a2dc56c8dee5d918 (diff) | |
MLK-17304-3: crypto: caam: Avoid dma_map call with empty bufferrel_imx_4.9.88_2.2.0_8qxp_beta2
While testing CONFIG_CRYPTO_MANAGER_DISABLE_TESTS, a Kernel panic
occurred at caamhash module.
The cause was the call of dma_map with empty buffer.
This fix the issue by checking for size before dma_map.
Signed-off-by: Aymen Sghaier <aymen.sghaier@nxp.com>
(cherry picked from commit 370f5b5fab33ebf712e2d2317db7bf3cd521f217)
| -rw-r--r-- | drivers/crypto/caam/caamhash.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index 3679bbf8391e..c3987747138d 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c @@ -1456,13 +1456,16 @@ static int ahash_final_no_ctx(struct ahash_request *req) desc = edesc->hw_desc; - state->buf_dma = dma_map_single(jrdev, buf, buflen, DMA_TO_DEVICE); - if (dma_mapping_error(jrdev, state->buf_dma)) { - dev_err(jrdev, "unable to map src\n"); - goto unmap; - } + if (buflen) { + state->buf_dma = dma_map_single(jrdev, buf, buflen, + DMA_TO_DEVICE); + if (dma_mapping_error(jrdev, state->buf_dma)) { + dev_err(jrdev, "unable to map src\n"); + goto unmap; + } - append_seq_in_ptr(desc, state->buf_dma, buflen, 0); + append_seq_in_ptr(desc, state->buf_dma, buflen, 0); + } edesc->dst_dma = map_seq_out_ptr_result(desc, jrdev, req->result, digestsize); |