media: platform: fix some double free in meson-ge2d and mtk-jpeg and s5p-mfc
Subsystems (6)
PATCH 1/1 media: platform: fix some double free in meson-ge2d and mtk-jpeg and s5p-mfc
video_unregister_device will release device internally. There is no need to call video_device_release after video_unregister_device.
Signed-off-by Hangyu Hua <[email protected]>
--- drivers/media/platform/amlogic/meson-ge2d/ge2d.c | 1 - drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c | 1 - drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-)
drivers/media/platform/amlogic/meson-ge2d/ge2d.c +0 -1
@@ -1030,7 +1030,6 @@ static int ge2d_remove(struct platform_device *pdev)video_unregister_device (ge2d->vfd);v4l2_m2m_release (ge2d->m2m_dev); -video_device_release (ge2d->vfd);v4l2_device_unregister (&ge2d->v4l2_dev);clk_disable_unprepare (ge2d->clk);
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +0 -1
@@ -1414,7 +1414,6 @@ static int mtk_jpeg_remove(struct platform_device *pdev)pm_runtime_disable (&pdev->dev);video_unregister_device (jpeg->vdev); -video_device_release (jpeg->vdev);v4l2_m2m_release (jpeg->m2m_dev);v4l2_device_unregister (&jpeg->v4l2_dev);
drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c +1 -2
@@ -1399,6 +1399,7 @@ static int s5p_mfc_probe(struct platform_device *pdev)/* Deinit MFC if probe had failed */ err_enc_reg:video_unregister_device (dev->vfd_dec); + dev->vfd_dec =NULL ; err_dec_reg:video_device_release (dev->vfd_enc); err_enc_alloc:
@@ -1444,8 +1445,6 @@ static int s5p_mfc_remove(struct platform_device *pdev)video_unregister_device (dev->vfd_enc);video_unregister_device (dev->vfd_dec); -video_device_release (dev->vfd_enc); -video_device_release (dev->vfd_dec);v4l2_device_unregister (&dev->v4l2_dev);s5p_mfc_unconfigure_dma_memory (dev);
Signature · 1 line
2.25.1