diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-10-22 11:20:10 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-23 02:07:55 -0400 |
commit | 41923e441305728ba3640e773e55d16e4769145c (patch) | |
tree | eeaad57d30237f5f26851f8f72a24485177ba077 /sound/pci/hda/hda_local.h | |
parent | 7507e8da2f21476007501f04d8bce2b7d0cb3971 (diff) |
[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.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/hda/hda_local.h')
-rw-r--r-- | sound/pci/hda/hda_local.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index a708effdcdad..20c5e6250374 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h | |||
@@ -310,16 +310,17 @@ enum { | |||
310 | 310 | ||
311 | extern const char *auto_pin_cfg_labels[AUTO_PIN_LAST]; | 311 | extern const char *auto_pin_cfg_labels[AUTO_PIN_LAST]; |
312 | 312 | ||
313 | #define AUTO_CFG_MAX_OUTS 5 | ||
314 | |||
313 | struct auto_pin_cfg { | 315 | struct auto_pin_cfg { |
314 | int line_outs; | 316 | int line_outs; |
315 | hda_nid_t line_out_pins[5]; /* sorted in the order of | 317 | /* sorted in the order of Front/Surr/CLFE/Side */ |
316 | * Front/Surr/CLFE/Side | 318 | hda_nid_t line_out_pins[AUTO_CFG_MAX_OUTS]; |
317 | */ | ||
318 | int speaker_outs; | 319 | int speaker_outs; |
319 | hda_nid_t speaker_pins[5]; | 320 | hda_nid_t speaker_pins[AUTO_CFG_MAX_OUTS]; |
320 | int hp_outs; | 321 | int hp_outs; |
321 | int line_out_type; /* AUTO_PIN_XXX_OUT */ | 322 | int line_out_type; /* AUTO_PIN_XXX_OUT */ |
322 | hda_nid_t hp_pins[5]; | 323 | hda_nid_t hp_pins[AUTO_CFG_MAX_OUTS]; |
323 | hda_nid_t input_pins[AUTO_PIN_LAST]; | 324 | hda_nid_t input_pins[AUTO_PIN_LAST]; |
324 | hda_nid_t dig_out_pin; | 325 | hda_nid_t dig_out_pin; |
325 | hda_nid_t dig_in_pin; | 326 | hda_nid_t dig_in_pin; |