From: Takashi Iwai <tiwai@suse.de>
To: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
alsa-devel@alsa-project.org, broonie@kernel.org, tiwai@suse.com,
yong.zhi@intel.com
Subject: Re: [PATCH] ALSA: hda: fix NULL pointer dereference during suspend
Date: Wed, 29 Jul 2020 09:48:08 +0200 [thread overview]
Message-ID: <s5hzh7iep8n.wl-tiwai@suse.de> (raw)
In-Reply-To: <20200728231011.1454066-1-ranjani.sridharan@linux.intel.com>
On Wed, 29 Jul 2020 01:10:11 +0200,
Ranjani Sridharan wrote:
>
> When the ASoC card registration fails and the codec component driver
> never probes, the codec device is not initialized and therefore
> memory for codec->wcaps is not allocated. This results in a NULL pointer
> dereference when the codec driver suspend callback is invoked during
> system suspend. Fix this by returning without performing any actions
> during codec suspend/resume if the card was not registered successfully.
>
> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
The code changes look OK to apply, but I still wonder how the runtime
PM gets invoked even if the device is not instantiated properly?
thanks,
Takashi
> ---
> sound/pci/hda/hda_codec.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
> index 3576e2d8452f..9b1f387d18e5 100644
> --- a/sound/pci/hda/hda_codec.c
> +++ b/sound/pci/hda/hda_codec.c
> @@ -2936,6 +2936,10 @@ static int hda_codec_runtime_suspend(struct device *dev)
> struct hda_codec *codec = dev_to_hda_codec(dev);
> unsigned int state;
>
> + /* Nothing to do if card registration fails and the component driver never probes */
> + if (!codec->card)
> + return 0;
> +
> cancel_delayed_work_sync(&codec->jackpoll_work);
> state = hda_call_codec_suspend(codec);
> if (codec->link_down_at_suspend ||
> @@ -2950,6 +2954,10 @@ static int hda_codec_runtime_resume(struct device *dev)
> {
> struct hda_codec *codec = dev_to_hda_codec(dev);
>
> + /* Nothing to do if card registration fails and the component driver never probes */
> + if (!codec->card)
> + return 0;
> +
> codec_display_power(codec, true);
> snd_hdac_codec_link_up(&codec->core);
> hda_call_codec_resume(codec);
> --
> 2.25.1
>
next prev parent reply other threads:[~2020-07-29 7:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 23:10 [PATCH] ALSA: hda: fix NULL pointer dereference during suspend Ranjani Sridharan
2020-07-29 7:48 ` Takashi Iwai [this message]
2020-07-29 9:39 ` Mark Brown
2020-07-29 15:03 ` Ranjani Sridharan
2020-07-29 16:06 ` Takashi Iwai
2020-07-30 13:07 ` Takashi Iwai
2020-07-30 17:33 ` Ranjani Sridharan
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=s5hzh7iep8n.wl-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=tiwai@suse.com \
--cc=yong.zhi@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;
as well as URLs for NNTP newsgroup(s).