Changeset 772 for GPL/trunk/alsa-kernel/hda/hdmi_chmap.c

Timestamp:

Apr 19, 2025, 8:08:37 PM (6 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/hda/hdmi_chmap.c (modified) (3 diffs)

GPL/trunk/alsa-kernel/hda/hdmi_chmap.c

@@ -761 +761 @@
 }
 
+/* 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)
@@ -772 +786 @@
         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
@@ -782 +800 @@
         if (!substream || !substream->runtime)
                 return 0; /* just for avoiding error from alsactl restore */
-        switch (substream->runtime->status->state) {
+        switch (substream->runtime->state) {
         case SNDRV_PCM_STATE_OPEN:
         case SNDRV_PCM_STATE_SETUP: