OSDN Git Service

ASoC: rt5640: Fix possible NULL pointer deref on resume
authorHans de Goede <hdegoede@redhat.com>
Thu, 6 Jan 2022 11:01:23 +0000 (12:01 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 6 Jan 2022 13:55:47 +0000 (13:55 +0000)
commita2d6d84db2e7bcc831aed90f33334c70a1b060a3
treecf6cfa90afc922f0aafdfb2e320dfbf8ec2c8182
parente4c35e75209bda13e57c9bc8d280366c2b9275a5
ASoC: rt5640: Fix possible NULL pointer deref on resume

Commit 2b9c8d2b3c89 ("ASoC: rt5640: Add the HDA header support") adds
re-queuing of the jack_work on resume when rt5640->jd_src != 0.

But the jack_work will unconditionally deref rt5640->jack and that might
be NULL. E.g. the sound/soc/intel/boards/bytcr_rt5640.c machine driver
call snd_soc_component_set_jack(codec, NULL, NULL) from pre_suspend to
disable the IRQ to avoid spurious wakeups, so when rt5640_resume()
runs rt5640->jack will be NULL in this case.

Make the queueing of the work conditional on rt5640->jack instead of
on rt5640->jd_src to fix this.

Fixes: 2b9c8d2b3c89 ("ASoC: rt5640: Add the HDA header support")
Cc: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20220106110128.66049-2-hdegoede@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt5640.c