diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2021-01-12 13:17:25 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-01-12 17:12:02 +0300 |
| commit | f2973a1de9d9890b6ac712fb1825d3449ee9cc93 (patch) | |
| tree | 87d6f5e3ba833ad99914f1514f941406f31b1ebf /sound/soc/codecs/es8316.c | |
| parent | 554a1b00957ec1033994a2d03b5b8eac59a24f3c (diff) | |
| download | linux-f2973a1de9d9890b6ac712fb1825d3449ee9cc93.tar.xz | |
ASoC: es8316: Fix possible NULL pointer deref in es8316_disable_jack_detect()
sound/soc/soc-core.c: soc_remove_component() unconditionally calls
snd_soc_component_set_jack(component, NULL, NULL); on any components
being removed.
This means that on machines where the machine-driver does not provide
a jack through snd_soc_component_set_jack() es8316_disable_jack_detect()
will still get called and at this time es8316->jack will be NULL and
the es8316->jack->status check in es8316_disable_jack_detect() will
lead to a NULL pointer deref.
Fix this by checking for es8316->jack bein NULL at the start of
es8316_disable_jack_detect() and turn the function into a no-op in
that case.
Cc: russianneuromancer <russianneuromancer@ya.ru>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210112101725.44200-1-hdegoede@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/es8316.c')
| -rw-r--r-- | sound/soc/codecs/es8316.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c index f9ec5cf82599..1ce84f12a4cf 100644 --- a/sound/soc/codecs/es8316.c +++ b/sound/soc/codecs/es8316.c @@ -681,6 +681,9 @@ static void es8316_disable_jack_detect(struct snd_soc_component *component) { struct es8316_priv *es8316 = snd_soc_component_get_drvdata(component); + if (!es8316->jack) + return; /* Already disabled (or never enabled) */ + disable_irq(es8316->irq); mutex_lock(&es8316->lock); |