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.