summaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2021-04-06 15:42:46 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-22 10:59:17 +0200
commit46fcf849461c4c8c97c7288ff1d33db35bd4b9ed (patch)
treeaf9de817c3cf60e652939811c38b2ea8c5f46319 /drivers/media/i2c
parent9531cee341a3427914e502597cf170bdf37d764f (diff)
downloadlinux-stable-46fcf849461c4c8c97c7288ff1d33db35bd4b9ed.tar.gz
linux-stable-46fcf849461c4c8c97c7288ff1d33db35bd4b9ed.tar.bz2
linux-stable-46fcf849461c4c8c97c7288ff1d33db35bd4b9ed.zip
media: adv7604: fix possible use-after-free in adv76xx_remove()
[ Upstream commit fa56f5f1fe31c2050675fa63b84963ebd504a5b3 ] This driver's remove path calls cancel_delayed_work(). However, that function does not wait until the work function finishes. This means that the callback function may still be running after the driver's remove function has finished, which would result in a use-after-free. Fix by calling cancel_delayed_work_sync(), which ensures that the work is properly cancelled, no longer running, and unable to re-schedule itself. Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/media/i2c')
-rw-r--r--drivers/media/i2c/adv7604.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index a4b0a89c7e7e..04577d409e63 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -3560,7 +3560,7 @@ static int adv76xx_remove(struct i2c_client *client)
io_write(sd, 0x6e, 0);
io_write(sd, 0x73, 0);
- cancel_delayed_work(&state->delayed_work_enable_hotplug);
+ cancel_delayed_work_sync(&state->delayed_work_enable_hotplug);
v4l2_async_unregister_subdev(sd);
media_entity_cleanup(&sd->entity);
adv76xx_unregister_clients(to_state(sd));