summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorDimitris Papastamos <dp@opensource.wolfsonmicro.com>2010-09-21 14:12:35 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-21 18:43:40 +0100
commitfa6d52938906305356555e37e38939c7bad8fd7a (patch)
treed8a5b909d990697bd57e7f83bbe06b61d0b54f4a /sound/soc
parent0b25ad0571e9208c2bd1302a41ce219794c6f901 (diff)
downloadlinux-3.10-fa6d52938906305356555e37e38939c7bad8fd7a.tar.gz
linux-3.10-fa6d52938906305356555e37e38939c7bad8fd7a.tar.bz2
linux-3.10-fa6d52938906305356555e37e38939c7bad8fd7a.zip
ASoC: Fix soc-cache buffer overflow bug
Make sure we stay within the cache boundaries when updating the register cache. Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-cache.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index 12281111f10..28bf1ff980c 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -203,8 +203,9 @@ static int snd_soc_8_16_write(struct snd_soc_codec *codec, unsigned int reg,
data[1] = (value >> 8) & 0xff;
data[2] = value & 0xff;
- if (!snd_soc_codec_volatile_register(codec, reg))
- reg_cache[reg] = value;
+ if (!snd_soc_codec_volatile_register(codec, reg)
+ && reg < codec->driver->reg_cache_size)
+ reg_cache[reg] = value;
if (codec->cache_only) {
codec->cache_sync = 1;