diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-09-13 03:52:49 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-13 19:08:31 -0400 |
commit | 7fe5daa3a267dc44677e471c3de88b8653aae541 (patch) | |
tree | f8b46a531684d0995e75a00969389d8d4daf3328 /sound/soc | |
parent | 9cea6e1ab0be55708d4aacf62dd69f99c700b9ab (diff) |
ASoC: 88pm860x: array overflow in snd_soc_put_volsw_2r_st()
commit d967967e8d1116fb38bad25e58714b5dddd03cca upstream.
This is called from snd_ctl_elem_write() with user supplied data so we
need to add some bounds checking.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc')
-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 60159c07448d..6fd174be3bdf 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c | |||
@@ -351,6 +351,9 @@ static int snd_soc_put_volsw_2r_st(struct snd_kcontrol *kcontrol, | |||
351 | val = ucontrol->value.integer.value[0]; | 351 | val = ucontrol->value.integer.value[0]; |
352 | val2 = ucontrol->value.integer.value[1]; | 352 | val2 = ucontrol->value.integer.value[1]; |
353 | 353 | ||
354 | if (val >= ARRAY_SIZE(st_table) || val2 >= ARRAY_SIZE(st_table)) | ||
355 | return -EINVAL; | ||
356 | |||
354 | err = snd_soc_update_bits(codec, reg, 0x3f, st_table[val].m); | 357 | err = snd_soc_update_bits(codec, reg, 0x3f, st_table[val].m); |
355 | if (err < 0) | 358 | if (err < 0) |
356 | return err; | 359 | return err; |