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

Commit 178c81e5 authored by Jingchang Lu's avatar Jingchang Lu Committed by Vinod Koul
Browse files

dma: fsl-edma: fix static checker warning of NULL dereference 



The static checker reports following warning:
	drivers/dma/fsl-edma.c:732 fsl_edma_xlate()
	error: we previously assumed 'chan' could be null (see line 737)
The changes of the loop cursor in the iteration may result in
NULL dereference when dma_get_slave_channel failed but loop
will continue. So use list_for_each_entry_safe() instead of
list_for_each_entry() to against this.

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJingchang Lu <b35083@freescale.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 7cbccb55

drivers/dma/fsl-edma.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -723,13 +723,13 @@ static struct dma_chan *fsl_edma_xlate(struct of_phandle_args *dma_spec, 
		struct of_dma *ofdma)

		struct of_dma *ofdma)

{

{

	struct fsl_edma_engine *fsl_edma = ofdma->of_dma_data;

	struct fsl_edma_engine *fsl_edma = ofdma->of_dma_data;

	struct dma_chan *chan;

	struct dma_chan *chan, *_chan;





	if (dma_spec->args_count != 2)

	if (dma_spec->args_count != 2)

		return NULL;

		return NULL;





	mutex_lock(&fsl_edma->fsl_edma_mutex);

	mutex_lock(&fsl_edma->fsl_edma_mutex);

	list_for_each_entry(chan, &fsl_edma->dma_dev.channels, device_node) {

	list_for_each_entry_safe(chan, _chan, &fsl_edma->dma_dev.channels, device_node) {

		if (chan->client_count)

		if (chan->client_count)

			continue;

			continue;

		if ((chan->chan_id / DMAMUX_NR) == dma_spec->args[0]) {

		if ((chan->chan_id / DMAMUX_NR) == dma_spec->args[0]) {