summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorZheng Wang <zyytlz.wz@163.com>2023-11-06 17:48:09 +0300
committerMauro Carvalho Chehab <mchehab@kernel.org>2023-11-23 15:37:04 +0300
commitd8212c5c87c143ca01b78f6bf61244af07e0058e (patch)
treecba5135f3fd5cbe11c39ee15f4f53113c77e716c /drivers/media
parentc411b39df8b84945e6d93e8c5ea586eaa5466f2a (diff)
downloadlinux-d8212c5c87c143ca01b78f6bf61244af07e0058e.tar.xz
media: mtk-jpeg: Remove cancel worker in mtk_jpeg_remove to avoid the crash of multi-core JPEG devices
This patch reverts commit c677d7ae8314 ("media: mtk-jpeg: Fix use after free bug due to uncanceled work"). The job_timeout_work is initialized only for the single-core JPEG device so it will cause the crash for multi-core JPEG devices. Fix it by removing the cancel_delayed_work_sync function. Fixes: c677d7ae8314 ("media: mtk-jpeg: Fix use after free bug due to uncanceled work") Signed-off-by: Zheng Wang <zyytlz.wz@163.com> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
index 73a063b1569b..7c2e6a2f6c40 100644
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
@@ -1402,7 +1402,6 @@ static void mtk_jpeg_remove(struct platform_device *pdev)
{
struct mtk_jpeg_dev *jpeg = platform_get_drvdata(pdev);
- cancel_delayed_work_sync(&jpeg->job_timeout_work);
pm_runtime_disable(&pdev->dev);
video_unregister_device(jpeg->vdev);
v4l2_m2m_release(jpeg->m2m_dev);