]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
ASoC: rt5645: Fix errorenous cleanup order
authorLin Ma <linma@zju.edu.cn>
Mon, 16 May 2022 09:20:35 +0000 (17:20 +0800)
committerStefan Bader <stefan.bader@canonical.com>
Wed, 10 Aug 2022 07:23:49 +0000 (09:23 +0200)
commit4b69f1e91374b5a42a2a2c3abe658c17e2a73c9a
treeddaac166e46839b73490c6e79ad6d34472660649
parentafc4e745d30bdf75450e889ed81d3bd92dd10745
ASoC: rt5645: Fix errorenous cleanup order

BugLink: https://bugs.launchpad.net/bugs/1981864
[ Upstream commit 2def44d3aec59e38d2701c568d65540783f90f2f ]

There is a logic error when removing rt5645 device as the function
rt5645_i2c_remove() first cancel the &rt5645->jack_detect_work and
delete the &rt5645->btn_check_timer latter. However, since the timer
handler rt5645_btn_check_callback() will re-queue the jack_detect_work,
this cleanup order is buggy.

That is, once the del_timer_sync in rt5645_i2c_remove is concurrently
run with the rt5645_btn_check_callback, the canceled jack_detect_work
will be rescheduled again, leading to possible use-after-free.

This patch fix the issue by placing the del_timer_sync function before
the cancel_delayed_work_sync.

Signed-off-by: Lin Ma <linma@zju.edu.cn>
Link: https://lore.kernel.org/r/20220516092035.28283-1-linma@zju.edu.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
sound/soc/codecs/rt5645.c