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

Commit acba2861 authored by Dāvis Mosāns's avatar Dāvis Mosāns Committed by Greg Kroah-Hartman
Browse files

crypto: ccp - ccp_dmaengine_unregister release dma channels 



[ Upstream commit 54cce8ecb9254f971b40a72911c6da403720a2d2 ]

ccp_dmaengine_register adds dma_chan->device_node to dma_dev->channels list
but ccp_dmaengine_unregister didn't remove them.
That can cause crashes in various dmaengine methods that tries to use dma_dev->channels

Fixes: 58ea8abf ("crypto: ccp - Register the CCP as a DMA...")
Signed-off-by: default avatarDāvis Mosāns <davispuh@gmail.com>
Acked-by: default avatarJohn Allen <john.allen@amd.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 39a521fa

drivers/crypto/ccp/ccp-dmaengine.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -633,6 +633,20 @@ static int ccp_terminate_all(struct dma_chan *dma_chan) 
	return 0;

	return 0;

}

}





static void ccp_dma_release(struct ccp_device *ccp)

{

	struct ccp_dma_chan *chan;

	struct dma_chan *dma_chan;

	unsigned int i;



	for (i = 0; i < ccp->cmd_q_count; i++) {

		chan = ccp->ccp_dma_chan + i;

		dma_chan = &chan->dma_chan;

		tasklet_kill(&chan->cleanup_tasklet);

		list_del_rcu(&dma_chan->device_node);

	}

}



int ccp_dmaengine_register(struct ccp_device *ccp)

int ccp_dmaengine_register(struct ccp_device *ccp)

{

{

	struct ccp_dma_chan *chan;

	struct ccp_dma_chan *chan;
@@ -737,6 +751,7 @@ int ccp_dmaengine_register(struct ccp_device *ccp) 
	return 0;

	return 0;





err_reg:

err_reg:

	ccp_dma_release(ccp);

	kmem_cache_destroy(ccp->dma_desc_cache);

	kmem_cache_destroy(ccp->dma_desc_cache);





err_cache:

err_cache:
@@ -753,6 +768,7 @@ void ccp_dmaengine_unregister(struct ccp_device *ccp) 
		return;

		return;





	dma_async_device_unregister(dma_dev);

	dma_async_device_unregister(dma_dev);

	ccp_dma_release(ccp);





	kmem_cache_destroy(ccp->dma_desc_cache);

	kmem_cache_destroy(ccp->dma_desc_cache);

	kmem_cache_destroy(ccp->dma_cmd_cache);

	kmem_cache_destroy(ccp->dma_cmd_cache);