Re: [PATCH v6 1/4] media: imagination: e5010: release m2m device on probe failure

[Thakkar, Devarsh]

On 23/10/26 20:16, Brnich, Brandon wrote:
> From: Myeonghun Pak <mhun512@xxxxxxxxx>
> 
> The probe path allocates the mem2mem device with v4l2_m2m_init(),
> but several later failures jump directly to the v4l2_device_unregister()
> unwind path. Since the driver core does not call .remove() after a failed
> probe, those paths leak the m2m device.
> 
> Route post-v4l2_m2m_init() failures through the existing m2m release step
> before unregistering the v4l2 device.
> 
> Fixes: a1e294045885 ("media: imagination: Add E5010 JPEG Encoder driver")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Myeonghun Pak <mhun512@xxxxxxxxx>
> Signed-off-by: Brandon Brnich <b-brnich@xxxxxx>

Reviewed-by: Devarsh Thakkar <devarsht@xxxxxx>

Regards
Devarsh

> ---
>  drivers/media/platform/imagination/e5010-jpeg-enc.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/media/platform/imagination/e5010-jpeg-enc.c b/drivers/media/platform/imagination/e5010-jpeg-enc.c
> index 420cb8bfdb12a..23d06709a6929 100644
> --- a/drivers/media/platform/imagination/e5010-jpeg-enc.c
> +++ b/drivers/media/platform/imagination/e5010-jpeg-enc.c
> @@ -1072,14 +1072,14 @@ static int e5010_probe(struct platform_device *pdev)
>  	if (IS_ERR(e5010->core_base)) {
>  		ret = PTR_ERR(e5010->core_base);
>  		dev_err_probe(dev, ret, "Missing 'core' resources area\n");
> -		goto fail_after_v4l2_register;
> +		goto fail_after_v4l2_m2m_init;
>  	}
>  
>  	e5010->mmu_base = devm_platform_ioremap_resource_byname(pdev, "mmu");
>  	if (IS_ERR(e5010->mmu_base)) {
>  		ret = PTR_ERR(e5010->mmu_base);
>  		dev_err_probe(dev, ret, "Missing 'mmu' resources area\n");
> -		goto fail_after_v4l2_register;
> +		goto fail_after_v4l2_m2m_init;
>  	}
>  
>  	e5010->last_context_run = NULL;
> @@ -1089,14 +1089,14 @@ static int e5010_probe(struct platform_device *pdev)
>  			       E5010_MODULE_NAME, e5010);
>  	if (ret) {
>  		dev_err_probe(dev, ret, "failed to register IRQ %d\n", irq);
> -		goto fail_after_v4l2_register;
> +		goto fail_after_v4l2_m2m_init;
>  	}
>  
>  	e5010->clk = devm_clk_get(dev, NULL);
>  	if (IS_ERR(e5010->clk)) {
>  		ret = PTR_ERR(e5010->clk);
>  		dev_err_probe(dev, ret, "failed to get clock\n");
> -		goto fail_after_v4l2_register;
> +		goto fail_after_v4l2_m2m_init;
>  	}
>  
>  	pm_runtime_enable(dev);
> @@ -1104,7 +1104,7 @@ static int e5010_probe(struct platform_device *pdev)
>  	ret = video_register_device(e5010->vdev, VFL_TYPE_VIDEO, 0);
>  	if (ret) {
>  		dev_err_probe(dev, ret, "failed to register video device\n");
> -		goto fail_after_video_register_device;
> +		goto fail_after_v4l2_m2m_init;
>  	}
>  
>  	v4l2_info(&e5010->v4l2_dev, "Device registered as /dev/video%d\n",
> @@ -1112,7 +1112,7 @@ static int e5010_probe(struct platform_device *pdev)
>  
>  	return 0;
>  
> -fail_after_video_register_device:
> +fail_after_v4l2_m2m_init:
>  	v4l2_m2m_release(e5010->m2m_dev);
>  fail_after_v4l2_register:
>  	v4l2_device_unregister(&e5010->v4l2_dev);