From: "Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>
To: Wentao Liang <vulab@iscas.ac.cn>,
cezary.rojewski@intel.com, liam.r.girdwood@linux.intel.com,
peter.ujfalusi@linux.intel.com, yung-chuan.liao@linux.intel.com,
ranjani.sridharan@linux.intel.com, kai.vehmanen@linux.intel.com,
pierre-louis.bossart@linux.dev, broonie@kernel.org,
perex@perex.cz, tiwai@suse.com
Cc: kuninori.morimoto.gx@renesas.com, linux-sound@vger.kernel.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH] ASoC: Intel: avs: rt274: Add null pointer check for snd_soc_card_get_codec_dai()
Date: Thu, 15 May 2025 11:23:36 +0200 [thread overview]
Message-ID: <3470451d-6768-42d4-93db-2783ffd9cbab@linux.intel.com> (raw)
In-Reply-To: <20250514141947.998-1-vulab@iscas.ac.cn>
On 2025-05-14 16:19, Wentao Liang wrote:
> The avs_card_suspend_pre() and avs_card_resume_post() in rt274
> calls the snd_soc_card_get_codec_dai(), but does not check its return
> value which is a null pointer if the function fails. This can result
> in a null pointer dereference. A proper implementation can be found
> in acp5x_nau8821_hw_params() and card_suspend_pre().
>
> Add a null pointer check for snd_soc_card_get_codec_dai() to avoid null
> pointer dereference when the function fails.
>
> Fixes: a08797afc1f9 ("ASoC: Intel: avs: rt274: Refactor jack handling")
> Cc: stable@vger.kernel.org # v6.2
> Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
> ---
> sound/soc/intel/avs/boards/rt274.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/sound/soc/intel/avs/boards/rt274.c b/sound/soc/intel/avs/boards/rt274.c
> index 4b6c02a40204..7a8b6ee79f4c 100644
> --- a/sound/soc/intel/avs/boards/rt274.c
> +++ b/sound/soc/intel/avs/boards/rt274.c
> @@ -194,6 +194,11 @@ static int avs_card_suspend_pre(struct snd_soc_card *card)
> {
> struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, RT274_CODEC_DAI);
>
> + if (!codec_dai) {
> + dev_err(card->dev, "Codec dai not found\n");
> + return -EINVAL;
> + }
> +
> return snd_soc_component_set_jack(codec_dai->component, NULL, NULL);
> }
>
> @@ -202,6 +207,11 @@ static int avs_card_resume_post(struct snd_soc_card *card)
> struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, RT274_CODEC_DAI);
> struct snd_soc_jack *jack = snd_soc_card_get_drvdata(card);
>
> + if (!codec_dai) {
> + dev_err(card->dev, "Codec dai not found\n");
> + return -EINVAL;
> + }
> +
> return snd_soc_component_set_jack(codec_dai->component, jack, NULL);
> }
>
Same as in other case, where Cezary commented - this is not needed, once
card is loaded codec should exist.
prev parent reply other threads:[~2025-05-15 9:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-14 14:19 [PATCH] ASoC: Intel: avs: rt274: Add null pointer check for snd_soc_card_get_codec_dai() Wentao Liang
2025-05-15 9:23 ` Amadeusz Sławiński [this message]
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=3470451d-6768-42d4-93db-2783ffd9cbab@linux.intel.com \
--to=amadeuszx.slawinski@linux.intel.com \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=peter.ujfalusi@linux.intel.com \
--cc=pierre-louis.bossart@linux.dev \
--cc=ranjani.sridharan@linux.intel.com \
--cc=stable@vger.kernel.org \
--cc=tiwai@suse.com \
--cc=vulab@iscas.ac.cn \
--cc=yung-chuan.liao@linux.intel.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