Commit b1e51d77 authored Jul 19, 2014 by Javier Martinez Canillas Committed by Vinod Koul Jul 22, 2014

dmaengine: pl330: Check if the DMA descriptor is NULL



Commit 6079d38c ("dmaengine: pl330: Remove useless xfer_cb indirection")
removed the __callback() function which created an unnecessary level of
indirection to execute the tranfer callback .xfer_cb

Unfortunately the commit also changed the semantics slightly since that
function used to check if the request was not NULL before attempting to
execute the callback function. Not checking this could lead to a kernel
NULL pointer dereference error.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

parent ff4d0241

drivers/dma/pl330.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -1441,9 +1441,14 @@ xfer_exit:

		static void dma_pl330_rqcb(struct dma_pl330_desc *desc, enum pl330_op_err err)
		{
		struct dma_pl330_chan *pch = desc->pchan;
		struct dma_pl330_chan *pch;
		unsigned long flags;

		if (!desc)
		return;

		pch = desc->pchan;

		/* If desc aborted */
		if (!pch)
		return;

Admin message