summaryrefslogtreecommitdiff
path: root/sound
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-21 10:42:01 +0100
commit3c4cab81a1ad3bc542b56e31f3aef94dc1b8b26a (patch)
tree3d40152243cb327210638f732091e0dbf6725139 /sound
parent4f5b0c735993482bfcc711fefc623a5e7babd011 (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')
-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 fbaa1bb41102..00d7902ad427 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -80,10 +80,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;