From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751952AbaAPJQz (ORCPT ); Thu, 16 Jan 2014 04:16:55 -0500 Received: from mailhost.informatik.uni-hamburg.de ([134.100.9.70]:55847 "EHLO mailhost.informatik.uni-hamburg.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751257AbaAPJQw (ORCPT ); Thu, 16 Jan 2014 04:16:52 -0500 Message-ID: <52D7A40A.3010202@metafoo.de> Date: Thu, 16 Jan 2014 10:19:06 +0100 From: Lars-Peter Clausen User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20131103 Icedove/17.0.10 MIME-Version: 1.0 To: Xiubo Li CC: lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.de, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ASoC: core: Fix possible NULL pointer dereference of pcm->config References: <1389859684-27456-1-git-send-email-Li.Xiubo@freescale.com> In-Reply-To: <1389859684-27456-1-git-send-email-Li.Xiubo@freescale.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/16/2014 09:08 AM, Xiubo Li wrote: > Since the soc generic dmaengine pcm driver allows using the defualt settings, > so the pcm->config maybe NULL. > > Signed-off-by: Xiubo Li Acked-by: Lars-Peter Clausen Thanks. I actually had the very same patch locally, but overlooked it. It would be good if this could make it into 3.14, since the jz4740 conversion to the generic dmaengine driver needs this. > --- > sound/soc/soc-generic-dmaengine-pcm.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c > index 560a778..5bace12 100644 > --- a/sound/soc/soc-generic-dmaengine-pcm.c > +++ b/sound/soc/soc-generic-dmaengine-pcm.c > @@ -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) >