summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-09-13 09:52:49 +0200
committerMark Brown <broonie@linaro.org>2013-09-13 19:36:39 +0200
commitd967967e8d1116fb38bad25e58714b5dddd03cca (patch)
tree98add03945c8971fa345073a3bcd6f2ae6da497c /sound
parentMerge remote-tracking branch 'asoc/topic/ssm2602' into tmp (diff)
downloadlinux-d967967e8d1116fb38bad25e58714b5dddd03cca.tar.xz
linux-d967967e8d1116fb38bad25e58714b5dddd03cca.zip
ASoC: 88pm860x: array overflow in snd_soc_put_volsw_2r_st()
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> Cc: stable@vger.kernel.org
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/88pm860x-codec.c3
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;