Commit 6278056e authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda: Add input value sanity checks to HDMI channel map controls 



Add a simple sanity check to HD-audio HDMI Channel Map controls.
Although the value might not be accepted for the actual connection, we
can filter out some bogus values beforehand, and that should be enough
for making kselftest happier.

Reviewed-by: default avatarJaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/20240616073454.16512-7-tiwai@suse.de
parent 210e6a84

sound/hda/hdmi_chmap.c

+18 −0
Original line number Diff line number Diff line
@@ -753,6 +753,20 @@ static int hdmi_chmap_ctl_get(struct snd_kcontrol *kcontrol, 
	return 0;

}



/* a simple sanity check for input values to chmap kcontrol */

static int chmap_value_check(struct hdac_chmap *hchmap,

			     const struct snd_ctl_elem_value *ucontrol)

{

	int i;



	for (i = 0; i < hchmap->channels_max; i++) {

		if (ucontrol->value.integer.value[i] < 0 ||

		    ucontrol->value.integer.value[i] > SNDRV_CHMAP_LAST)

			return -EINVAL;

	}

	return 0;

}



static int hdmi_chmap_ctl_put(struct snd_kcontrol *kcontrol,

			      struct snd_ctl_elem_value *ucontrol)

{
@@ -764,6 +778,10 @@ static int hdmi_chmap_ctl_put(struct snd_kcontrol *kcontrol, 
	unsigned char chmap[8], per_pin_chmap[8];

	int i, err, ca, prepared = 0;



	err = chmap_value_check(hchmap, ucontrol);

	if (err < 0)

		return err;



	/* No monitor is connected in dyn_pcm_assign.

	 * It's invalid to setup the chmap

	 */