summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUmang Jain <uajain@igalia.com>2025-11-20 19:47:57 +0530
committerTakashi Iwai <tiwai@suse.de>2025-11-21 10:35:04 +0100
commit9ef1203fc73570290e09be65b15df84815ca4089 (patch)
treefa510de3b4467875b56e19fc8d055d9132af3547
parentc639065e142582b886f294be82130f46bbdc707a (diff)
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"). Signed-off-by: Umang Jain <uajain@igalia.com> Link: https://patch.msgid.link/20251120141757.901505-1-uajain@igalia.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/core/pcm_drm_eld.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/pcm_drm_eld.c b/sound/core/pcm_drm_eld.c
index 688eefce82fa..cb2eebaac85f 100644
--- a/sound/core/pcm_drm_eld.c
+++ b/sound/core/pcm_drm_eld.c
@@ -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;