Merge branch 'for-next' into for-linus

Merged 4.8 changes.

1 files changed, 25 insertions, 3 deletions

diff --git a/sound/hda/hdmi_chmap.c b/sound/hda/hdmi_chmap.c
index c6c75e7e0981..81acc20c2535 100644
--- a/sound/hda/hdmi_chmap.c
+++ b/sound/hda/hdmi_chmap.c
@@ -353,7 +353,8 @@ static void hdmi_std_setup_channel_mapping(struct hdac_chmap *chmap,
                 int hdmi_slot = 0;
                 /* fill actual channel mappings in ALSA channel (i) order */
                 for (i = 0; i < ch_alloc->channels; i++) {
-                        while (!ch_alloc->speakers[7 - hdmi_slot] && !WARN_ON(hdmi_slot >= 8))
+                        while (!WARN_ON(hdmi_slot >= 8) &&
+                               !ch_alloc->speakers[7 - hdmi_slot])
                                 hdmi_slot++; /* skip zero slots */
 
                         hdmi_channel_mapping[ca][i] = (i << 4) | hdmi_slot++;
@@ -430,6 +431,12 @@ static int to_cea_slot(int ordered_ca, unsigned char pos)
         int mask = snd_hdac_chmap_to_spk_mask(pos);
         int i;
 
+        /* Add sanity check to pass klockwork check.
+         * This should never happen.
+         */
+        if (ordered_ca >= ARRAY_SIZE(channel_allocations))
+                return -1;
+
         if (mask) {
                 for (i = 0; i < 8; i++) {
                         if (channel_allocations[ordered_ca].speakers[7 - i] == mask)
@@ -456,7 +463,15 @@ EXPORT_SYMBOL_GPL(snd_hdac_spk_to_chmap);
 /* from CEA slot to ALSA API channel position */
 static int from_cea_slot(int ordered_ca, unsigned char slot)
 {
-        int mask = channel_allocations[ordered_ca].speakers[7 - slot];
+        int mask;
+
+        /* Add sanity check to pass klockwork check.
+         * This should never happen.
+         */
+        if (slot >= 8)
+                return 0;
+
+        mask = channel_allocations[ordered_ca].speakers[7 - slot];
 
         return snd_hdac_spk_to_chmap(mask);
 }
@@ -523,7 +538,8 @@ static void hdmi_setup_fake_chmap(unsigned char *map, int ca)
         int ordered_ca = get_channel_allocation_order(ca);
 
         for (i = 0; i < 8; i++) {
-                if (i < channel_allocations[ordered_ca].channels)
+                if (ordered_ca < ARRAY_SIZE(channel_allocations) &&
+                    i < channel_allocations[ordered_ca].channels)
                         map[i] = from_cea_slot(ordered_ca, hdmi_channel_mapping[ca][i] & 0x0f);
                 else
                         map[i] = 0;
@@ -551,6 +567,12 @@ int snd_hdac_get_active_channels(int ca)
 {
         int ordered_ca = get_channel_allocation_order(ca);
 
+        /* Add sanity check to pass klockwork check.
+         * This should never happen.
+         */
+        if (ordered_ca >= ARRAY_SIZE(channel_allocations))
+                ordered_ca = 0;
+
         return channel_allocations[ordered_ca].channels;
 }
 EXPORT_SYMBOL_GPL(snd_hdac_get_active_channels);