media: mtk-jpeg: Remove cancel worker in mtk_jpeg_remove to avoid the crash of multi...
authorZheng Wang <zyytlz.wz@163.com>
Mon, 6 Nov 2023 14:48:09 +0000 (15:48 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jan 2024 23:35:32 +0000 (15:35 -0800)
[ Upstream commit d8212c5c87c143ca01b78f6bf61244af07e0058e ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c

index 7194f88..60425c9 100644 (file)
@@ -1403,7 +1403,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);