lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 161/663] media: imx: Unregister csc/scaler only if registered
    Date
    From: Ezequiel Garcia <ezequiel@collabora.com>

    [ Upstream commit bb2216548a2b13cf2942a058b475438a7a6bb028 ]

    The csc/scaler device pointer (imxmd->m2m_vdev) is assigned
    after the imx media device v4l2-async probe completes,
    therefore we need to check if the device is non-NULL
    before trying to unregister it.

    This can be the case if the non-completed imx media device
    is unbinded (or the driver is removed), leading to a kernel oops.

    Fixes: a8ef0488cc59 ("media: imx: add csc/scaler mem2mem device")
    Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
    Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
    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/staging/media/imx/imx-media-dev.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c
    index 6d2205461e565..338b8bd0bb076 100644
    --- a/drivers/staging/media/imx/imx-media-dev.c
    +++ b/drivers/staging/media/imx/imx-media-dev.c
    @@ -53,6 +53,7 @@ static int imx6_media_probe_complete(struct v4l2_async_notifier *notifier)
    imxmd->m2m_vdev = imx_media_csc_scaler_device_init(imxmd);
    if (IS_ERR(imxmd->m2m_vdev)) {
    ret = PTR_ERR(imxmd->m2m_vdev);
    + imxmd->m2m_vdev = NULL;
    goto unlock;
    }

    @@ -107,10 +108,14 @@ static int imx_media_remove(struct platform_device *pdev)

    v4l2_info(&imxmd->v4l2_dev, "Removing imx-media\n");

    + if (imxmd->m2m_vdev) {
    + imx_media_csc_scaler_device_unregister(imxmd->m2m_vdev);
    + imxmd->m2m_vdev = NULL;
    + }
    +
    v4l2_async_notifier_unregister(&imxmd->notifier);
    imx_media_unregister_ipu_internal_subdevs(imxmd);
    v4l2_async_notifier_cleanup(&imxmd->notifier);
    - imx_media_csc_scaler_device_unregister(imxmd->m2m_vdev);
    media_device_unregister(&imxmd->md);
    v4l2_device_unregister(&imxmd->v4l2_dev);
    media_device_cleanup(&imxmd->md);
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 02:40    [W:2.222 / U:0.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site