summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorPawel Harlozinski <pawel.harlozinski@linux.intel.com>2019-11-12 14:02:36 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-17 20:34:55 +0100
commitd88d9321e88cce771734377577767db0b1fea0cf (patch)
treeb75ad2b337f27e1f87013818bc8bb67f1740f212 /sound/soc
parent29674d00ca2b363863d397ab9226f6846206080b (diff)
ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report
commit 8f157d4ff039e03e2ed4cb602eeed2fd4687a58f upstream. Check for existance of jack before tracing. NULL pointer dereference has been reported by KASAN while unloading machine driver (snd_soc_cnl_rt274). Signed-off-by: Pawel Harlozinski <pawel.harlozinski@linux.intel.com> Link: https://lore.kernel.org/r/20191112130237.10141-1-pawel.harlozinski@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-jack.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index c7b990abdbaa..2a528e73bad2 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -100,10 +100,9 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
unsigned int sync = 0;
int enable;
- trace_snd_soc_jack_report(jack, mask, status);
-
if (!jack)
return;
+ trace_snd_soc_jack_report(jack, mask, status);
dapm = &jack->card->dapm;