2022-01-07 08:18:37

by Miaoqian Lin

Subject: [PATCH] media: coda: Fix missing put_device() call in coda_get_vdoa_data

The reference taken by 'of_find_device_by_node()' must be released when
not needed anymore.
Add the corresponding 'put_device()' in the error handling path.

Fixes: e7f3c5481035 ("[media] coda: use VDOA for un-tiling custom macroblock format")
Signed-off-by: Miaoqian Lin <[email protected]>
---
drivers/media/platform/coda/coda-common.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 0e312b0842d7..579849082488 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -405,9 +405,13 @@ static struct vdoa_data *coda_get_vdoa_data(void)
goto out;

vdoa_data = platform_get_drvdata(vdoa_pdev);
- if (!vdoa_data)
+ if (!vdoa_data) {
vdoa_data = ERR_PTR(-EPROBE_DEFER);
+ goto put;
+ }

+put:
+ put_device(&vdoa_pdev->dev);
out:
of_node_put(vdoa_node);

--
2.17.1

2022-01-11 10:06:36

by Hans Verkuil

Subject: Re: [PATCH] media: coda: Fix missing put_device() call in coda_get_vdoa_data

On 07/01/2022 09:18, Miaoqian Lin wrote:
> The reference taken by 'of_find_device_by_node()' must be released when
> not needed anymore.
> Add the corresponding 'put_device()' in the error handling path.
>
> Fixes: e7f3c5481035 ("[media] coda: use VDOA for un-tiling custom macroblock format")
> Signed-off-by: Miaoqian Lin <[email protected]>
> ---
> drivers/media/platform/coda/coda-common.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
> index 0e312b0842d7..579849082488 100644
> --- a/drivers/media/platform/coda/coda-common.c
> +++ b/drivers/media/platform/coda/coda-common.c
> @@ -405,9 +405,13 @@ static struct vdoa_data *coda_get_vdoa_data(void)
> goto out;
>
> vdoa_data = platform_get_drvdata(vdoa_pdev);
> - if (!vdoa_data)
> + if (!vdoa_data) {
> vdoa_data = ERR_PTR(-EPROBE_DEFER);
> + goto put;

Why the goto put? Just drop the goto...

> + }
>
> +put:

...and this label.

> + put_device(&vdoa_pdev->dev);

This is the real fix :-)

Regards,

Hans

> out:
> of_node_put(vdoa_node);
>

2022-01-12 11:06:04

by Miaoqian Lin

Subject: [PATCH v2] media: coda: Fix missing put_device() call in coda_get_vdoa_data

The reference taken by 'of_find_device_by_node()' must be released when
not needed anymore.
Add the corresponding 'put_device()' in the error handling path.

Fixes: e7f3c5481035 ("[media] coda: use VDOA for un-tiling custom macroblock format")
Signed-off-by: Miaoqian Lin <[email protected]>
---
Changes in v2:
- remove the goto and unused label.
---
drivers/media/platform/coda/coda-common.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 0e312b0842d7..c3942b0abb00 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -408,6 +408,7 @@ static struct vdoa_data *coda_get_vdoa_data(void)
if (!vdoa_data)
vdoa_data = ERR_PTR(-EPROBE_DEFER);

+ put_device(&vdoa_pdev->dev);
out:
of_node_put(vdoa_node);

--
2.17.1