sound/pci/hda/patch_via.c: array overflow
sound/pci/hda/patch_via.c contains the following code:
<-- snip -->
...
struct via_spec {
...
hda_nid_t private_dac_nids[4];
... ^^^
};
...
static int vt1709_auto_fill_dac_nids(struct via_spec *spec,
const struct auto_pin_cfg *cfg)
{
...
spec->multiout.dac_nids = spec->private_dac_nids;
if (cfg->line_outs == 4) { /* 10 channels */ <------------------
for (i = 0; i < cfg->line_outs; i++) {
nid = cfg->line_out_pins[i];
if (nid) {
/* config dac list */
switch (i) {
case AUTO_SEQ_FRONT:
/* AOW0 */
spec->multiout.dac_nids[i] = 0x10;
break;
case AUTO_SEQ_CENLFE:
/* AOW2 */
spec->multiout.dac_nids[i] = 0x12;
break;
case AUTO_SEQ_SURROUND:
/* AOW3 */
spec->multiout.dac_nids[i] = 0x27;
break;
case AUTO_SEQ_SIDE:
/* AOW1 */
spec->multiout.dac_nids[i] = 0x11;
break;
default:
break;
}
}
}
spec->multiout.dac_nids[cfg->line_outs] = 0x28; /* AOW4 */... ^^^^^^^^^^^^^^
<-- snip -->
Spotted by the Coverity checker.
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedAt Fri, 19 Oct 2007 14:57:09 +0200,
Quoted 46 lines · Adrian Bunk
sound/pci/hda/patch_via.ccontains the following code:<-- snip -->
...
structvia_spec{
...hda_nid_t private_dac_nids[4];... ^^^
};
...
static int vt1709_auto_fill_dac_nids(structvia_spec*spec,
const structauto_pin_cfg*cfg)
{
...spec->multiout.dac_nids = spec->private_dac_nids; if (cfg->line_outs == 4) { /* 10 channels */ <------------------ for (i = 0; i < cfg->line_outs; i++) { nid = cfg->line_out_pins[i]; if (nid) { /* config dac list */ switch (i) { case AUTO_SEQ_FRONT: /* AOW0 */ spec->multiout.dac_nids[i] = 0x10; break; case AUTO_SEQ_CENLFE: /* AOW2 */ spec->multiout.dac_nids[i] = 0x12; break; case AUTO_SEQ_SURROUND: /* AOW3 */ spec->multiout.dac_nids[i] = 0x27; break; case AUTO_SEQ_SIDE: /* AOW1 */ spec->multiout.dac_nids[i] = 0x11; break; default: break; } } } spec->multiout.dac_nids[cfg->line_outs] = 0x28; /* AOW4 */
Quoted 5 lines
... ^^^^^^^^^^^^^^
<-- snip -->
Spotted by the Coverity checker.
Thanks. The following patch was applied to ALSA tree.
Takashi
[ALSA] hda-codec - Fix possible array overflow
dac_nids arrays in each codec support code may have up to 5 items when assigned from the auto-configurator. Some codec codes have less numbers than the possible max. This patch defines the constant and fixes the array definitions.
---
sound/pci/hda/hda_local.h +6 -5
@@ -310,16 +310,17 @@ enum {extern const char *auto_pin_cfg_labels[AUTO_PIN_LAST ]; +#define AUTO_CFG_MAX_OUTS 5 +struct auto_pin_cfg {int line_outs; -hda_nid_t line_out_pins[5 ];/* sorted in the order of -* Front/Surr/CLFE/Side -*/ +/* sorted in the order of Front/Surr/CLFE/Side */ +hda_nid_t line_out_pins[AUTO_CFG_MAX_OUTS ];int speaker_outs; -hda_nid_t speaker_pins[5 ]; +hda_nid_t speaker_pins[AUTO_CFG_MAX_OUTS ];int hp_outs;int line_out_type;/* AUTO_PIN_XXX_OUT */ -hda_nid_t hp_pins[5 ]; +hda_nid_t hp_pins[AUTO_CFG_MAX_OUTS ];hda_nid_t input_pins[AUTO_PIN_LAST ];hda_nid_t dig_out_pin;hda_nid_t dig_in_pin;
sound/pci/hda/patch_analog.c +1 -1
@@ -72,7 +72,7 @@ struct ad198x_spec {unsigned int num_kctl_alloc, num_kctl_used;struct snd_kcontrol_new *kctl_alloc;struct hda_input_mux private_imux; -hda_nid_t private_dac_nids[4 ]; +hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS ]; unsigned int jack_present :1;
sound/pci/hda/patch_cmedia.c +1 -2
@@ -50,7 +50,7 @@ struct cmi_spec {/* playback */ struct hda_multi_out multiout; -hda_nid_t dac_nids[4 ];/* NID for each DAC */ +hda_nid_t dac_nids[AUTO_CFG_MAX_OUTS ];/* NID for each DAC */ int num_dacs;/* capture */
@@ -73,7 +73,6 @@ struct cmi_spec {unsigned int pin_def_confs;/* multichannel pins */ -hda_nid_t multich_pin[4 ];/* max 8-channel */ struct hda_verb multi_init[9 ];/* 2 verbs for each pin + terminator */ };
sound/pci/hda/patch_conexant.c +1 -1
@@ -85,7 +85,7 @@ struct conexant_spec {unsigned int num_kctl_alloc, num_kctl_used;struct snd_kcontrol_new *kctl_alloc;struct hda_input_mux private_imux; -hda_nid_t private_dac_nids[4 ]; +hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS ]; };
sound/pci/hda/patch_realtek.c +1 -1
@@ -238,7 +238,7 @@ struct alc_spec {unsigned int num_kctl_alloc, num_kctl_used;struct snd_kcontrol_new *kctl_alloc;struct hda_input_mux private_imux; -hda_nid_t private_dac_nids[5 ]; +hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS ];/* hooks */ void (*init_hook)(struct hda_codec *codec);
sound/pci/hda/patch_via.c +1 -1
@@ -114,7 +114,7 @@ struct via_spec {unsigned int num_kctl_alloc, num_kctl_used;struct snd_kcontrol_new *kctl_alloc;struct hda_input_mux private_imux; -hda_nid_t private_dac_nids[4 ]; +hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS ];#ifdef CONFIG_SND_HDA_POWER_SAVE struct hda_loopback_check loopback;