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

Commit ec4f2857 authored by Xiubo Li's avatar Xiubo Li Committed by Mark Brown
Browse files

ASoC: core: Fix possible NULL pointer dereference of pcm->config 



Since the soc generic dmaengine pcm driver allows using the defualt settings,
so the pcm->config maybe NULL.

Signed-off-by: default avatarXiubo Li <Li.Xiubo@freescale.com>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent d70e861a

sound/soc/soc-generic-dmaengine-pcm.c

+6 −3
Original line number Diff line number Diff line
@@ -176,17 +176,20 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel( 
{

	struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);

	struct snd_dmaengine_dai_dma_data *dma_data;

	dma_filter_fn fn = NULL;



	dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);



	if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && pcm->chan[0])

		return pcm->chan[0];



	if (pcm->config->compat_request_channel)

	if (pcm->config && pcm->config->compat_request_channel)

		return pcm->config->compat_request_channel(rtd, substream);



	return snd_dmaengine_pcm_request_channel(pcm->config->compat_filter_fn,

						 dma_data->filter_data);

	if (pcm->config)

		fn = pcm->config->compat_filter_fn;



	return snd_dmaengine_pcm_request_channel(fn, dma_data->filter_data);

}



static bool dmaengine_pcm_can_report_residue(struct dma_chan *chan)