releases/5.0.15/asoc-dapm-fix-null-pointer-dereference-in-snd_soc_da.patch

   1 From c4788065a2e5837a1ea21ffc2454a8203c22832f Mon Sep 17 00:00:00 2001
   2 From: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
   3 Date: Fri, 22 Mar 2019 18:00:09 +0530
   4 Subject: ASoC: dapm: Fix NULL pointer dereference in
   5  snd_soc_dapm_free_kcontrol
   6
   7 [ Upstream commit cacea3a90e211f0c111975535508d446a4a928d2 ]
   8
   9 w_text_param can be NULL and it is being dereferenced without checking.
  10 Add the missing sanity check to prevent  NULL pointer dereference.
  11
  12 Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
  13 Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
  14 Signed-off-by: Mark Brown <broonie@kernel.org>
  15 Signed-off-by: Sasha Levin <sashal@kernel.org>
  16 ---
  17  sound/soc/soc-dapm.c | 4 ++++
  18  1 file changed, 4 insertions(+)
  19
  20 diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
  21 index 20bad755888b1..08ab5fef75dca 100644
  22 --- a/sound/soc/soc-dapm.c
  23 +++ b/sound/soc/soc-dapm.c
  24 @@ -3840,6 +3840,10 @@ snd_soc_dapm_free_kcontrol(struct snd_soc_card *card,
  25         int count;
  26
  27         devm_kfree(card->dev, (void *)*private_value);
  28 +
  29 +       if (!w_param_text)
  30 +               return;
  31 +
  32         for (count = 0 ; count < num_params; count++)
  33                 devm_kfree(card->dev, (void *)w_param_text[count]);
  34         devm_kfree(card->dev, w_param_text);
  35 --
  36 2.20.1
  37