OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
David Henningsson 2013-01-16 11:45:35 +01:00 committed by Takashi Iwai
parent ea46c3c87c
commit b56fa1ed09
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/pci/hda/hda_generic.c
View File

@ -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]);
}