Commit 9ef1203f authored by Umang Jain's avatar Umang Jain Committed by Takashi Iwai
Browse files

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 ce9778b7("ALSA: hda/hdmi: Consider ELD is invalid when no
SAD is present").

Signed-off-by: default avatarUmang Jain <uajain@igalia.com>
Link: https://patch.msgid.link/20251120141757.901505-1-uajain@igalia.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c639065e

sound/core/pcm_drm_eld.c

+1 −1
Original line number Diff line number Diff line
@@ -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;