From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Brian Norris <briannorris@chromium.org>
Cc: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, <linux-kernel@vger.kernel.org>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
<alsa-devel@alsa-project.org>
Subject: Re: [PATCH for-4.11] ASoC: don't dereference NULL pcm_{new,free}
Date: Thu, 9 Mar 2017 00:17:41 +0000 [thread overview]
Message-ID: <87zigvz4q3.wl%kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <20170308231854.50167-1-briannorris@chromium.org>
Hi Brian
Thank you for your patch
> Not all platform drivers have pcm_{new,free} callbacks. Seen with a
> "snd-soc-dummy" codec from sound/soc/rockchip/rk3399_gru_sound.c.
(snip)
> Fixes: 99b04f4c4051 ("ASoC: add Component level pcm_new/pcm_free")
> Signed-off-by: Brian Norris <briannorris@chromium.org>
> ---
> I'm really not that familiar with this subsystem... but this does fix the
> crash seen here.
>
> sound/soc/soc-core.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
> index 6dca408faae3..2722bb0c5573 100644
> --- a/sound/soc/soc-core.c
> +++ b/sound/soc/soc-core.c
> @@ -3326,7 +3326,10 @@ static int snd_soc_platform_drv_pcm_new(struct snd_soc_pcm_runtime *rtd)
> {
> struct snd_soc_platform *platform = rtd->platform;
>
> - return platform->driver->pcm_new(rtd);
> + if (platform->driver->pcm_new)
> + return platform->driver->pcm_new(rtd);
> + else
> + return 0;
> }
>
> static void snd_soc_platform_drv_pcm_free(struct snd_pcm *pcm)
> @@ -3334,7 +3337,8 @@ static void snd_soc_platform_drv_pcm_free(struct snd_pcm *pcm)
> struct snd_soc_pcm_runtime *rtd = pcm->private_data;
> struct snd_soc_platform *platform = rtd->platform;
>
> - platform->driver->pcm_free(pcm);
> + if (platform->driver->pcm_free)
> + platform->driver->pcm_free(pcm);
> }
It is a littlle bit strange for me.
commit 99b04f4c4051 has below code. This means, if platform doesn't have pcm_new/free callback,
component doesn't have snd_soc_platform_drv_pcm_new/free.
But your case, platform doesn't have pcm_new/free, but component had it ?
...
@@ -3181,6 +3198,10 @@ int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform,
platform->component.probe = snd_soc_platform_drv_probe;
if (platform_drv->remove)
platform->component.remove = snd_soc_platform_drv_remove;
+ if (platform_drv->pcm_new)
+ platform->component.pcm_new = snd_soc_platform_drv_pcm_new;
+ if (platform_drv->pcm_free)
+ platform->component.pcm_free = snd_soc_platform_drv_pcm_free;
#ifdef CONFIG_DEBUG_FS
platform->component.debugfs_prefix = "platform";
next prev parent reply other threads:[~2017-03-09 0:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-08 23:18 [PATCH for-4.11] ASoC: don't dereference NULL pcm_{new,free} Brian Norris
2017-03-09 0:17 ` Kuninori Morimoto [this message]
2017-03-09 0:21 ` Brian Norris
2017-03-09 0:53 ` Kuninori Morimoto
2017-03-11 0:39 ` Brian Norris
2017-03-13 3:46 ` Kuninori Morimoto
2017-03-13 21:41 ` Brian Norris
2017-03-14 1:07 ` Kuninori Morimoto
2017-03-09 11:09 ` Mark Brown
2017-03-11 0:24 ` Brian Norris
2017-03-13 12:50 ` Mark Brown
2017-03-13 21:52 ` Brian Norris
2017-03-14 13:36 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zigvz4q3.wl%kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=alsa-devel@alsa-project.org \
--cc=briannorris@chromium.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).