| From 8f157d4ff039e03e2ed4cb602eeed2fd4687a58f Mon Sep 17 00:00:00 2001 |
| From: Pawel Harlozinski <pawel.harlozinski@linux.intel.com> |
| Date: Tue, 12 Nov 2019 14:02:36 +0100 |
| Subject: ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report |
| |
| From: Pawel Harlozinski <pawel.harlozinski@linux.intel.com> |
| |
| 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> |
| |
| --- |
| sound/soc/soc-jack.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/sound/soc/soc-jack.c |
| +++ b/sound/soc/soc-jack.c |
| @@ -69,10 +69,9 @@ void snd_soc_jack_report(struct snd_soc_ |
| 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); |
| |
| codec = jack->codec; |
| dapm = &codec->dapm; |