diff options
| author | Pankaj Bharadiya | 2019-03-22 13:30:09 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-05-10 17:54:07 +0200 |
| commit | d356db088333d1e3f317316b65e267bfa19ce7a2 (patch) | |
| tree | cc8a2b616af01538881d541b050bb5ba1d64d99c /sound/soc | |
| parent | ASoC: cs4270: Set auto-increment bit for register writes (diff) | |
| download | kernel-qcow2-linux-d356db088333d1e3f317316b65e267bfa19ce7a2.tar.gz kernel-qcow2-linux-d356db088333d1e3f317316b65e267bfa19ce7a2.tar.xz kernel-qcow2-linux-d356db088333d1e3f317316b65e267bfa19ce7a2.zip | |
ASoC: dapm: Fix NULL pointer dereference in snd_soc_dapm_free_kcontrol
[ Upstream commit cacea3a90e211f0c111975535508d446a4a928d2 ]
w_text_param can be NULL and it is being dereferenced without checking.
Add the missing sanity check to prevent NULL pointer dereference.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-dapm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 9b78fb3daa7b..2257b1b0151c 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3847,6 +3847,10 @@ snd_soc_dapm_free_kcontrol(struct snd_soc_card *card, int count; devm_kfree(card->dev, (void *)*private_value); + + if (!w_param_text) + return; + for (count = 0 ; count < num_params; count++) devm_kfree(card->dev, (void *)w_param_text[count]); devm_kfree(card->dev, w_param_text); |