Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e6173c1 authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Greg Kroah-Hartman
Browse files

staging: ccree: check DMA pool buf !NULL before free 



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: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarSudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 61377bc8

drivers/staging/ccree/ssi_buffer_mgr.c

+2 −1
Original line number Diff line number Diff line
@@ -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);