diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-27 15:56:19 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-27 15:56:19 +0200 |
| commit | 448c3f6884700fc467669d4453b7f5983a5ba1cb (patch) | |
| tree | 1addb010e0985ed82dc3a62988f44068a3ca7116 /sound/soc/codecs | |
| parent | Linux 3.12-rc2 (diff) | |
| parent | ASoC: 88pm860x: array overflow in snd_soc_put_volsw_2r_st() (diff) | |
| download | linux-448c3f6884700fc467669d4453b7f5983a5ba1cb.tar.xz linux-448c3f6884700fc467669d4453b7f5983a5ba1cb.zip | |
Merge remote-tracking branch 'asoc/fix/88pm860x' into asoc-linus
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/88pm860x-codec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index 8af04343cc1a..259d1ac4492f 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c @@ -349,6 +349,9 @@ static int snd_soc_put_volsw_2r_st(struct snd_kcontrol *kcontrol, val = ucontrol->value.integer.value[0]; val2 = ucontrol->value.integer.value[1]; + if (val >= ARRAY_SIZE(st_table) || val2 >= ARRAY_SIZE(st_table)) + return -EINVAL; + err = snd_soc_update_bits(codec, reg, 0x3f, st_table[val].m); if (err < 0) return err; |