staging: ccree: check DMA pool buf !NULL before free
authorGilad Ben-Yossef <gilad@benyossef.com>
Sun, 7 Jan 2018 12:14:24 +0000 (12:14 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 20 Oct 2018 07:48:53 +0000 (09:48 +0200)
commit 2f7caf6b02145bd9cd9d0b56204f51a5fefe7790 upstream.

If we ran out of DMA pool buffers, we get into the unmap
code path with a NULL before. Deal with this by checking
the virtual mapping is not NULL.

Cc: stable@vger.kernel.org
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ccree/ssi_buffer_mgr.c

index 6393609..4ba6e9c 100644 (file)
@@ -492,7 +492,8 @@ void ssi_buffer_mgr_unmap_blkcipher_request(
                                 DMA_TO_DEVICE);
        }
        /* Release pool */
-       if (req_ctx->dma_buf_type == SSI_DMA_BUF_MLLI) {
+       if (req_ctx->dma_buf_type == SSI_DMA_BUF_MLLI &&
+           req_ctx->mlli_params.mlli_virt_addr) {
                dma_pool_free(req_ctx->mlli_params.curr_pool,
                              req_ctx->mlli_params.mlli_virt_addr,
                              req_ctx->mlli_params.mlli_dma_addr);