ALSA: pcm: Harden the spk_alloc assumption check
PATCH 1/1 ALSA: pcm: Harden the spk_alloc assumption check
If the parsed ELD has spk_alloc=0, it currently assigns the parsed ELD spk_alloc to 0xffff. However, we should also check if there is at least one SAD (Short audio descriptor) to enforce the assumption, as ELD without any sad_count, is usually considered invalid for e.g. in commit ce9778b7a0272("ALSA: hda/hdmi: Consider ELD is invalid when no SAD is present").
--- sound/core/pcm_drm_eld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/core/pcm_drm_eld.c +1 -1
@@ -379,7 +379,7 @@ int snd_parse_eld(struct device *dev, struct snd_parsed_hdmi_eld *e,* in console or for audio devices. Assume the highest speakers * configuration, to _not_ prohibit multi-channel audio playback. */ -if (!e->spk_alloc) +if (!e->spk_alloc && e->sad_count) e->spk_alloc =0xffff ;return 0 ;
Signature · 1 line
2.51.2
Takashi Iwai
AppliedQuoted 9 lines · Umang Jain
If the parsed ELD has spk_alloc=0, it currently assigns the parsed ELD
spk_allocto0xffff. However, we should also check if there is at least one SAD (Short audio descriptor) to enforce the assumption, as ELD without anysad_count, is usually considered invalid for e.g. in commitce9778b7a0272("ALSA: hda/hdmi: Consider ELD is invalid when no SAD is present").Signed-off-by Umang Jain <[email protected]>
Thanks, applied now.
Takashi