[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <86cdafd1-f77c-4c15-9777-0197e91cf0a5@linux.intel.com>
Date: Thu, 15 May 2025 11:23:16 +0200
From: Amadeusz Sławiński
<amadeuszx.slawinski@...ux.intel.com>
To: Wentao Liang <vulab@...as.ac.cn>, cezary.rojewski@...el.com,
liam.r.girdwood@...ux.intel.com, peter.ujfalusi@...ux.intel.com,
yung-chuan.liao@...ux.intel.com, ranjani.sridharan@...ux.intel.com,
kai.vehmanen@...ux.intel.com, pierre-louis.bossart@...ux.dev,
broonie@...nel.org, perex@...ex.cz, tiwai@...e.com
Cc: kuninori.morimoto.gx@...esas.com, linux-sound@...r.kernel.org,
linux-kernel@...r.kernel.org, stable@...r.kernel.org
Subject: Re: [PATCH] ASoC: Intel: avs: nau8825: Add null pointer check for
snd_soc_card_get_codec_dai()
On 2025-05-14 16:04, Wentao Liang wrote:
> The function avs_card_suspend_pre() in nau8825 calls the function
> 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: 9febcd7a0180 ("ASoC: Intel: avs: nau8825: Refactor jack handling")
> Cc: stable@...r.kernel.org # v6.2
> Signed-off-by: Wentao Liang <vulab@...as.ac.cn>
> ---
> sound/soc/intel/avs/boards/nau8825.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/sound/soc/intel/avs/boards/nau8825.c b/sound/soc/intel/avs/boards/nau8825.c
> index bf902540744c..5baeb95cd5a6 100644
> --- a/sound/soc/intel/avs/boards/nau8825.c
> +++ b/sound/soc/intel/avs/boards/nau8825.c
> @@ -220,6 +220,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, SKL_NUVOTON_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);
> }
>
Same as in other case, where Cezary commented - this is not needed, once
card is loaded codec should exist.
Powered by blists - more mailing lists