summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2021-04-06 16:48:12 +0300
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2021-04-09 13:54:00 +0300
commit2c9541720c66899adf6f3600984cf3ef151295ad (patch)
tree0fe1bbc08b090e4fe72d6701cfad84586e94849b /drivers/media
parentfa56f5f1fe31c2050675fa63b84963ebd504a5b3 (diff)
downloadlinux-2c9541720c66899adf6f3600984cf3ef151295ad.tar.xz
media: i2c: adv7511-v4l2: fix possible use-after-free in adv7511_remove()
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/i2c/adv7511-v4l2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/adv7511-v4l2.c b/drivers/media/i2c/adv7511-v4l2.c
index 992db5c79b13..5fc6c06edda1 100644
--- a/drivers/media/i2c/adv7511-v4l2.c
+++ b/drivers/media/i2c/adv7511-v4l2.c
@@ -1958,7 +1958,7 @@ static int adv7511_remove(struct i2c_client *client)
adv7511_set_isr(sd, false);
adv7511_init_setup(sd);
- cancel_delayed_work(&state->edid_handler);
+ cancel_delayed_work_sync(&state->edid_handler);
i2c_unregister_device(state->i2c_edid);
i2c_unregister_device(state->i2c_cec);
i2c_unregister_device(state->i2c_pktmem);