From: Shengjiu Wang <shengjiu.wang@gmail.com>
To: Shengjiu Wang <shengjiu.wang@nxp.com>
Cc: Timur Tabi <timur@kernel.org>,
Nicolin Chen <nicoleotsuka@gmail.com>,
Xiubo Li <Xiubo.Lee@gmail.com>,
Fabio Estevam <festevam@gmail.com>,
Mark Brown <broonie@kernel.org>,
Linux-ALSA <alsa-devel@alsa-project.org>,
Liam Girdwood <lgirdwood@gmail.com>,
perex@perex.cz, Takashi Iwai <tiwai@suse.com>,
linuxppc-dev@lists.ozlabs.org,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2] ASoC: fsl_easrc: Check for null pointer before dereferencing "ctx" in fsl_easrc_hw_free()
Date: Sat, 25 Apr 2020 15:49:16 +0800 [thread overview]
Message-ID: <CAA+D8APuhgO0DF74GtCcR1AXTU0ZRR+Njupr0VP4o5jNgTQ3ew@mail.gmail.com> (raw)
In-Reply-To: <d23c939f1c9eeb3fce34b6c34d44e2d6156f663a.1587799355.git.shengjiu.wang@nxp.com>
On Sat, Apr 25, 2020 at 3:30 PM Shengjiu Wang <shengjiu.wang@nxp.com> wrote:
>
> The patch 955ac624058f: "ASoC: fsl_easrc: Add EASRC ASoC CPU DAI
> drivers" from Apr 16, 2020, leads to the following Smatch complaint:
>
> sound/soc/fsl/fsl_easrc.c:1529 fsl_easrc_hw_free()
> warn: variable dereferenced before check 'ctx' (see line 1527)
>
> sound/soc/fsl/fsl_easrc.c
> 1526 struct fsl_asrc_pair *ctx = runtime->private_data;
> 1527 struct fsl_easrc_ctx_priv *ctx_priv = ctx->private;
> ^^^^^
> Dereference
>
> 1528
> 1529 if (ctx && (ctx_priv->ctx_streams & BIT(substream->stream))) {
> ^^^
> This check is too late, to prevent a NULL dereference.
>
> 1530 ctx_priv->ctx_streams &= ~BIT(substream->stream);
> 1531 fsl_easrc_release_context(ctx);
>
> Fixes: 955ac624058f ("ASoC: fsl_easrc: Add EASRC ASoC CPU DAI drivers")
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> ---
Sorry,I forgot the changes:
changes in v2:
- refine the commit subject.
best regards
Wang shengjiu
> sound/soc/fsl/fsl_easrc.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/fsl/fsl_easrc.c b/sound/soc/fsl/fsl_easrc.c
> index 97658e1f4989..20326bffab64 100644
> --- a/sound/soc/fsl/fsl_easrc.c
> +++ b/sound/soc/fsl/fsl_easrc.c
> @@ -1524,9 +1524,14 @@ static int fsl_easrc_hw_free(struct snd_pcm_substream *substream,
> {
> struct snd_pcm_runtime *runtime = substream->runtime;
> struct fsl_asrc_pair *ctx = runtime->private_data;
> - struct fsl_easrc_ctx_priv *ctx_priv = ctx->private;
> + struct fsl_easrc_ctx_priv *ctx_priv;
>
> - if (ctx && (ctx_priv->ctx_streams & BIT(substream->stream))) {
> + if (!ctx)
> + return -EINVAL;
> +
> + ctx_priv = ctx->private;
> +
> + if (ctx_priv->ctx_streams & BIT(substream->stream)) {
> ctx_priv->ctx_streams &= ~BIT(substream->stream);
> fsl_easrc_release_context(ctx);
> }
> --
> 2.21.0
>
next prev parent reply other threads:[~2020-04-25 7:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-25 7:19 [PATCH v2] ASoC: fsl_easrc: Check for null pointer before dereferencing "ctx" in fsl_easrc_hw_free() Shengjiu Wang
2020-04-25 7:49 ` Shengjiu Wang [this message]
2020-04-26 22:20 ` Nicolin Chen
2020-04-27 13:09 ` 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=CAA+D8APuhgO0DF74GtCcR1AXTU0ZRR+Njupr0VP4o5jNgTQ3ew@mail.gmail.com \
--to=shengjiu.wang@gmail.com \
--cc=Xiubo.Lee@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=festevam@gmail.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=nicoleotsuka@gmail.com \
--cc=perex@perex.cz \
--cc=shengjiu.wang@nxp.com \
--cc=timur@kernel.org \
--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).