]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
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>
Mon, 8 Jan 2018 15:27:23 +0000 (16:27 +0100)
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ccree/ssi_buffer_mgr.c

index e85bb53a3289b46eaa9bd03978a0dc9c4f80d2e9..78288ed75281eff6a4710ca28dca85108f9514d3 100644 (file)
@@ -465,7 +465,8 @@ void cc_unmap_blkcipher_request(struct device *dev, void *ctx,
                                 DMA_TO_DEVICE);
        }
        /* Release pool */
-       if (req_ctx->dma_buf_type == CC_DMA_BUF_MLLI) {
+       if (req_ctx->dma_buf_type == CC_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);