diff options
| author | Kai Vehmanen <kai.vehmanen@linux.intel.com> | 2020-07-17 16:13:35 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-07-20 16:08:22 +0100 |
| commit | 6b540ac763e9d11506ec1eb6b0fadc70292bb4a6 (patch) | |
| tree | 3a3917b1598000c02343b4b11749f2b12ed985b4 /sound | |
| parent | 15ef2ea035db7bcb9a9d0bf3747fbb7dde67dd97 (diff) | |
| download | lwn-6b540ac763e9d11506ec1eb6b0fadc70292bb4a6.tar.gz lwn-6b540ac763e9d11506ec1eb6b0fadc70292bb4a6.zip | |
ASoC: Intel: sof_sdw: avoid crash if invalid DSP topology loaded
The mc_private->hdmi_pcm_list is populated by elements loaded during
DSP topology load. Valid topologies for this machine driver will always
have PCM nodes for HDMI, but driver should fail gracefully even in the case
this is not true. Add a sanity check to sof_sdw_hdmi_card_late_probe()
for this case. Without the fix, a null pcm handle gets dereferenced.
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@linux.intel.com>
Link: https://lore.kernel.org/r/20200717211337.31956-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/boards/sof_sdw_hdmi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/intel/boards/sof_sdw_hdmi.c b/sound/soc/intel/boards/sof_sdw_hdmi.c index 72316d34eed6..99b04bb2f3a0 100644 --- a/sound/soc/intel/boards/sof_sdw_hdmi.c +++ b/sound/soc/intel/boards/sof_sdw_hdmi.c @@ -55,6 +55,9 @@ int sof_sdw_hdmi_card_late_probe(struct snd_soc_card *card) if (!ctx->idisp_codec) return 0; + if (list_empty(&ctx->hdmi_pcm_list)) + return -EINVAL; + pcm = list_first_entry(&ctx->hdmi_pcm_list, struct hdmi_pcm, head); component = pcm->codec_dai->component; |