Skip to content

Commit 1f810d2

Browse files
plbossartbroonie
authored andcommitted
ASoC: SOF: Intel: hda-dai: fix possible stream_tag leak
The HDaudio stream allocation is done first, and in a second step the LOSIDV parameter is programmed for the multi-link used by a codec. This leads to a possible stream_tag leak, e.g. if a DisplayAudio link is not used. This would happen when a non-Intel graphics card is used and userspace unconditionally uses the Intel Display Audio PCMs without checking if they are connected to a receiver with jack controls. We should first check that there is a valid multi-link entry to configure before allocating a stream_tag. This change aligns the dma_assign and dma_cleanup phases. Complements: b0cd60f ("ALSA/ASoC: hda: clarify bus_get_link() and bus_link_get() helpers") Link: thesofproject#4151 Signed-off-by: Pierre-Louis Bossart <[email protected]> Reviewed-by: Ranjani Sridharan <[email protected]> Reviewed-by: Rander Wang <[email protected]> Reviewed-by: Bard Liao <[email protected]> Signed-off-by: Peter Ujfalusi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 5afc7ee commit 1f810d2

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

sound/soc/sof/intel/hda-dai.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@ static int hda_link_dma_hw_params(struct snd_pcm_substream *substream,
216216
sdev = snd_soc_component_get_drvdata(cpu_dai->component);
217217
bus = sof_to_bus(sdev);
218218

219+
hlink = snd_hdac_ext_bus_get_hlink_by_name(bus, codec_dai->component->name);
220+
if (!hlink)
221+
return -EINVAL;
222+
219223
hext_stream = snd_soc_dai_get_dma_data(cpu_dai, substream);
220224
if (!hext_stream) {
221225
hext_stream = hda_link_stream_assign(bus, substream);
@@ -225,10 +229,6 @@ static int hda_link_dma_hw_params(struct snd_pcm_substream *substream,
225229
snd_soc_dai_set_dma_data(cpu_dai, substream, (void *)hext_stream);
226230
}
227231

228-
hlink = snd_hdac_ext_bus_get_hlink_by_name(bus, codec_dai->component->name);
229-
if (!hlink)
230-
return -EINVAL;
231-
232232
/* set the hdac_stream in the codec dai */
233233
snd_soc_dai_set_stream(codec_dai, hdac_stream(hext_stream), substream->stream);
234234

0 commit comments

Comments
 (0)