diff options
author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-09-28 17:29:37 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-09 12:23:47 -0700 |
commit | 8f805204b5b0595140be2b33e2297d8ba1c7fc13 (patch) | |
tree | 256151ccbcf9e2211a22f5d8f833aaca0ba42a0a /sound | |
parent | 5b744c01491f0b12ac47e8db28065975fc65a0e2 (diff) |
ASoC: core: fix possible ZERO_SIZE_PTR pointer dereferencing error.
commit 6596aa047b624aeec2ea321962cfdecf9953a383 upstream.
Since we cannot make sure the 'params->num_regs' will always be none
zero here, and then if it equals to zero, the kmemdup() will return
ZERO_SIZE_PTR, which equals to ((void *)16).
So this patch fix this with just doing the zero check before calling
kmemdup().
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index b87d7d882e6d..49acc989e452 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3181,7 +3181,7 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol, unsigned int val, mask; void *data; - if (!component->regmap) + if (!component->regmap || !params->num_regs) return -EINVAL; len = params->num_regs * component->val_bytes; |