projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b90d776
)
[ALSA] ac97 - Fix potential negative array index
author
Takashi Iwai
<tiwai@suse.de>
Wed, 8 Nov 2006 14:48:43 +0000
(15:48 +0100)
committer
Jaroslav Kysela
<perex@server.perex.cz>
Wed, 20 Dec 2006 07:55:50 +0000
(08:55 +0100)
Fix the case cidx2 >= 0 and cidx2 < 0 which may result in negative
array index.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
sound/pci/ac97/ac97_patch.c
patch
|
blob
|
blame
|
history
diff --git
a/sound/pci/ac97/ac97_patch.c
b/sound/pci/ac97/ac97_patch.c
index f63025e99ab6ad6133890f6ad7c2490ae200df51..e813968e0cf8a91324e1822e2453396836cf9991 100644
(file)
--- a/
sound/pci/ac97/ac97_patch.c
+++ b/
sound/pci/ac97/ac97_patch.c
@@
-1467,7
+1467,9
@@
static void patch_ad1881_chained(struct snd_ac97 * ac97, int unchained_idx, int
snd_ac97_write_cache(ac97, AC97_AD_CODEC_CFG, 0x0002); // ID1C
ac97->spec.ad18xx.codec_cfg[unchained_idx] = 0x0002;
if (cidx1 >= 0) {
- if (patch_ad1881_chained1(ac97, cidx1, 0x0006)) // SDIE | ID1C
+ if (cidx2 < 0)
+ patch_ad1881_chained1(ac97, cidx1, 0);
+ else if (patch_ad1881_chained1(ac97, cidx1, 0x0006)) // SDIE | ID1C
patch_ad1881_chained1(ac97, cidx2, 0);
else if (patch_ad1881_chained1(ac97, cidx2, 0x0006)) // SDIE | ID1C
patch_ad1881_chained1(ac97, cidx1, 0);