From: David Henningsson <david.henningsson@canonical.com>
Date: Wed, 16 Jan 2013 10:45:35 +0000 (+0100)
Subject: ALSA: hda - Check array bounds in get_input_path
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b56fa1ed09615f148271045d220b1c55580bdfc9;p=openwrt%2Fstaging%2Fblogic.git

ALSA: hda - Check array bounds in get_input_path

This gives us some additional safety.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index e878a9effc96..1fa71acc348d 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -2403,8 +2403,16 @@ static int create_input_ctls(struct hda_codec *codec)
 static struct nid_path *get_input_path(struct hda_codec *codec, int adc_idx, int imux_idx)
 {
 	struct hda_gen_spec *spec = codec->spec;
+	if (imux_idx < 0 || imux_idx >= HDA_MAX_NUM_INPUTS) {
+		snd_BUG();
+		return NULL;
+	}
 	if (spec->dyn_adc_switch)
 		adc_idx = spec->dyn_adc_idx[imux_idx];
+	if (adc_idx < 0 || adc_idx >= AUTO_CFG_MAX_OUTS) {
+		snd_BUG();
+		return NULL;
+	}
 	return snd_hda_get_path_from_idx(codec, spec->input_paths[imux_idx][adc_idx]);
 }