]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: i2c: tda1997: Fix possible use-after-free in tda1997x_remove()
authorYang Yingliang <yangyingliang@huawei.com>
Tue, 6 Apr 2021 13:49:45 +0000 (15:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 May 2021 12:04:11 +0000 (14:04 +0200)
[ Upstream commit 7f820ab5d4eebfe2d970d32a76ae496a6c286f0f ]

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>
drivers/media/i2c/tda1997x.c

index 5e68182001ecc8bd0ef703716b2ac231c4ababd6..e43d8327b81039d66cb3f91ac307b0acebf06f1f 100644 (file)
@@ -2804,7 +2804,7 @@ static int tda1997x_remove(struct i2c_client *client)
        media_entity_cleanup(&sd->entity);
        v4l2_ctrl_handler_free(&state->hdl);
        regulator_bulk_disable(TDA1997X_NUM_SUPPLIES, state->supplies);
-       cancel_delayed_work(&state->delayed_work_enable_hpd);
+       cancel_delayed_work_sync(&state->delayed_work_enable_hpd);
        mutex_destroy(&state->page_lock);
        mutex_destroy(&state->lock);