linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/meson: Fix refcount leak in meson_encoder_hdmi_init
@ 2022-05-11  5:40 Miaoqian Lin
  2022-05-12 12:20 ` Neil Armstrong
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Miaoqian Lin @ 2022-05-11  5:40 UTC (permalink / raw)
  To: Neil Armstrong, David Airlie, Daniel Vetter, Kevin Hilman,
	Jerome Brunet, Martin Blumenstingl, Sam Ravnborg, dri-devel,
	linux-amlogic, linux-arm-kernel, linux-kernel
  Cc: linmq006

of_find_device_by_node() takes reference, we should use put_device()
to release it when not need anymore.
Add missing put_device() in error path to avoid refcount
leak.

Fixes: 0af5e0b41110 ("drm/meson: encoder_hdmi: switch to bridge DRM_BRIDGE_ATTACH_NO_CONNECTOR")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
 drivers/gpu/drm/meson/meson_encoder_hdmi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
index 5e306de6f485..de87f02cd388 100644
--- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c
+++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
@@ -435,8 +435,10 @@ int meson_encoder_hdmi_init(struct meson_drm *priv)
 		cec_fill_conn_info_from_drm(&conn_info, meson_encoder_hdmi->connector);
 
 		notifier = cec_notifier_conn_register(&pdev->dev, NULL, &conn_info);
-		if (!notifier)
+		if (!notifier) {
+			put_device(&pdev->dev);
 			return -ENOMEM;
+		}
 
 		meson_encoder_hdmi->cec_notifier = notifier;
 	}
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [PATCH] drm/meson: Fix refcount leak in meson_encoder_hdmi_init
  2022-05-11  5:40 [PATCH] drm/meson: Fix refcount leak in meson_encoder_hdmi_init Miaoqian Lin
@ 2022-05-12 12:20 ` Neil Armstrong
  2022-05-12 12:38 ` Martin Blumenstingl
  2022-05-18  7:23 ` Neil Armstrong
  2 siblings, 0 replies; 8+ messages in thread
From: Neil Armstrong @ 2022-05-12 12:20 UTC (permalink / raw)
  To: Miaoqian Lin, David Airlie, Daniel Vetter, Kevin Hilman,
	Jerome Brunet, Martin Blumenstingl, Sam Ravnborg, dri-devel,
	linux-amlogic, linux-arm-kernel, linux-kernel

On 11/05/2022 07:40, Miaoqian Lin wrote:
> of_find_device_by_node() takes reference, we should use put_device()
> to release it when not need anymore.
> Add missing put_device() in error path to avoid refcount
> leak.
> 
> Fixes: 0af5e0b41110 ("drm/meson: encoder_hdmi: switch to bridge DRM_BRIDGE_ATTACH_NO_CONNECTOR")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> ---
>   drivers/gpu/drm/meson/meson_encoder_hdmi.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
> index 5e306de6f485..de87f02cd388 100644
> --- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c
> +++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
> @@ -435,8 +435,10 @@ int meson_encoder_hdmi_init(struct meson_drm *priv)
>   		cec_fill_conn_info_from_drm(&conn_info, meson_encoder_hdmi->connector);
>   
>   		notifier = cec_notifier_conn_register(&pdev->dev, NULL, &conn_info);
> -		if (!notifier)
> +		if (!notifier) {
> +			put_device(&pdev->dev);
>   			return -ENOMEM;
> +		}
>   
>   		meson_encoder_hdmi->cec_notifier = notifier;
>   	}

Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] drm/meson: Fix refcount leak in meson_encoder_hdmi_init
  2022-05-11  5:40 [PATCH] drm/meson: Fix refcount leak in meson_encoder_hdmi_init Miaoqian Lin
  2022-05-12 12:20 ` Neil Armstrong
@ 2022-05-12 12:38 ` Martin Blumenstingl
  2022-05-12 15:33   ` Neil Armstrong
  2022-05-18  7:23 ` Neil Armstrong
  2 siblings, 1 reply; 8+ messages in thread
From: Martin Blumenstingl @ 2022-05-12 12:38 UTC (permalink / raw)
  To: Miaoqian Lin, Neil Armstrong
  Cc: David Airlie, Daniel Vetter, Kevin Hilman, Jerome Brunet,
	Sam Ravnborg, dri-devel, linux-amlogic, linux-arm-kernel,
	linux-kernel

On Wed, May 11, 2022 at 7:41 AM Miaoqian Lin <linmq006@gmail.com> wrote:
>
> of_find_device_by_node() takes reference, we should use put_device()
> to release it when not need anymore.
> Add missing put_device() in error path to avoid refcount
> leak.
>
> Fixes: 0af5e0b41110 ("drm/meson: encoder_hdmi: switch to bridge DRM_BRIDGE_ATTACH_NO_CONNECTOR")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

Thanks for sending this patch!

Neil, while reviewing this I noticed that on module unload we're also
not calling put_device().
This note doesn't affect this patch - but I am wondering if we need to
put that put_device() during module unload on our TODO-list?


Best regards,
Martin

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] drm/meson: Fix refcount leak in meson_encoder_hdmi_init
  2022-05-12 12:38 ` Martin Blumenstingl
@ 2022-05-12 15:33   ` Neil Armstrong
  0 siblings, 0 replies; 8+ messages in thread
From: Neil Armstrong @ 2022-05-12 15:33 UTC (permalink / raw)
  To: Martin Blumenstingl, Miaoqian Lin
  Cc: David Airlie, Daniel Vetter, Kevin Hilman, Jerome Brunet,
	Sam Ravnborg, dri-devel, linux-amlogic, linux-arm-kernel,
	linux-kernel

Hi,

On 12/05/2022 14:38, Martin Blumenstingl wrote:
> On Wed, May 11, 2022 at 7:41 AM Miaoqian Lin <linmq006@gmail.com> wrote:
>>
>> of_find_device_by_node() takes reference, we should use put_device()
>> to release it when not need anymore.
>> Add missing put_device() in error path to avoid refcount
>> leak.
>>
>> Fixes: 0af5e0b41110 ("drm/meson: encoder_hdmi: switch to bridge DRM_BRIDGE_ATTACH_NO_CONNECTOR")
>> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> 
> Thanks for sending this patch!
> 
> Neil, while reviewing this I noticed that on module unload we're also
> not calling put_device().
> This note doesn't affect this patch - but I am wondering if we need to
> put that put_device() during module unload on our TODO-list?
> 

Indeed, it should be fixed.

Neil


> 
> Best regards,
> Martin


^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] drm/meson: Fix refcount leak in meson_encoder_hdmi_init
  2022-05-11  5:40 [PATCH] drm/meson: Fix refcount leak in meson_encoder_hdmi_init Miaoqian Lin
  2022-05-12 12:20 ` Neil Armstrong
  2022-05-12 12:38 ` Martin Blumenstingl
@ 2022-05-18  7:23 ` Neil Armstrong
  2 siblings, 0 replies; 8+ messages in thread
From: Neil Armstrong @ 2022-05-18  7:23 UTC (permalink / raw)
  To: linux-amlogic, Sam Ravnborg, Daniel Vetter, Kevin Hilman,
	linux-arm-kernel, dri-devel, Jerome Brunet, linux-kernel,
	Miaoqian Lin, Martin Blumenstingl, David Airlie
  Cc: Neil Armstrong

Hi,

On Wed, 11 May 2022 09:40:51 +0400, Miaoqian Lin wrote:
> of_find_device_by_node() takes reference, we should use put_device()
> to release it when not need anymore.
> Add missing put_device() in error path to avoid refcount
> leak.
> 
> 

Thanks, Applied to https://anongit.freedesktop.org/git/drm/drm-misc.git (drm-misc-next)

[1/1] drm/meson: Fix refcount leak in meson_encoder_hdmi_init
      https://cgit.freedesktop.org/drm/drm-misc/commit/?id=7381076809586528e2a812a709e2758916318a99

-- 
Neil

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] drm/meson: Fix refcount leak in meson_encoder_hdmi_init
  2022-05-12  9:32 ` Neil Armstrong
@ 2022-05-12 11:17   ` Miaoqian Lin
  0 siblings, 0 replies; 8+ messages in thread
From: Miaoqian Lin @ 2022-05-12 11:17 UTC (permalink / raw)
  To: Neil Armstrong, David Airlie, Daniel Vetter, Kevin Hilman,
	Jerome Brunet, Martin Blumenstingl, Sam Ravnborg, dri-devel,
	linux-amlogic, linux-arm-kernel, linux-kernel

Hi,

On 2022/5/12 17:32, Neil Armstrong wrote:
> Hi,
>
> On 12/05/2022 11:21, Miaoqian Lin wrote:
>> of_find_device_by_node() takes a reference to the embedded struct device,
>> we should use put_device() to release it when not need anymore.
>> Add missing put_device() in error path to avoid refcount leak.
>>
>> Fixes: 0af5e0b41110 ("drm/meson: encoder_hdmi: switch to bridge DRM_BRIDGE_ATTACH_NO_CONNECTOR")
>> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
>
> You already sent the same patch yesterday, please avoid this.
>
Sorry for the mistake, I realized this after I sent it. I will be more careful.


> Neil
>
>> ---
>>   drivers/gpu/drm/meson/meson_encoder_hdmi.c | 4 +++-
>>   1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
>> index 5e306de6f485..de87f02cd388 100644
>> --- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c
>> +++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
>> @@ -435,8 +435,10 @@ int meson_encoder_hdmi_init(struct meson_drm *priv)
>>           cec_fill_conn_info_from_drm(&conn_info, meson_encoder_hdmi->connector);
>>             notifier = cec_notifier_conn_register(&pdev->dev, NULL, &conn_info);
>> -        if (!notifier)
>> +        if (!notifier) {
>> +            put_device(&pdev->dev);
>>               return -ENOMEM;
>> +        }
>>             meson_encoder_hdmi->cec_notifier = notifier;
>>       }
>

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] drm/meson: Fix refcount leak in meson_encoder_hdmi_init
  2022-05-12  9:21 Miaoqian Lin
@ 2022-05-12  9:32 ` Neil Armstrong
  2022-05-12 11:17   ` Miaoqian Lin
  0 siblings, 1 reply; 8+ messages in thread
From: Neil Armstrong @ 2022-05-12  9:32 UTC (permalink / raw)
  To: Miaoqian Lin, David Airlie, Daniel Vetter, Kevin Hilman,
	Jerome Brunet, Martin Blumenstingl, Sam Ravnborg, dri-devel,
	linux-amlogic, linux-arm-kernel, linux-kernel

Hi,

On 12/05/2022 11:21, Miaoqian Lin wrote:
> of_find_device_by_node() takes a reference to the embedded struct device,
> we should use put_device() to release it when not need anymore.
> Add missing put_device() in error path to avoid refcount leak.
> 
> Fixes: 0af5e0b41110 ("drm/meson: encoder_hdmi: switch to bridge DRM_BRIDGE_ATTACH_NO_CONNECTOR")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>

You already sent the same patch yesterday, please avoid this.

Neil

> ---
>   drivers/gpu/drm/meson/meson_encoder_hdmi.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
> index 5e306de6f485..de87f02cd388 100644
> --- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c
> +++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
> @@ -435,8 +435,10 @@ int meson_encoder_hdmi_init(struct meson_drm *priv)
>   		cec_fill_conn_info_from_drm(&conn_info, meson_encoder_hdmi->connector);
>   
>   		notifier = cec_notifier_conn_register(&pdev->dev, NULL, &conn_info);
> -		if (!notifier)
> +		if (!notifier) {
> +			put_device(&pdev->dev);
>   			return -ENOMEM;
> +		}
>   
>   		meson_encoder_hdmi->cec_notifier = notifier;
>   	}


^ permalink raw reply	[flat|nested] 8+ messages in thread
* [PATCH] drm/meson: Fix refcount leak in meson_encoder_hdmi_init
@ 2022-05-12  9:21 Miaoqian Lin
  2022-05-12  9:32 ` Neil Armstrong
  0 siblings, 1 reply; 8+ messages in thread
From: Miaoqian Lin @ 2022-05-12  9:21 UTC (permalink / raw)
  To: Neil Armstrong, David Airlie, Daniel Vetter, Kevin Hilman,
	Jerome Brunet, Martin Blumenstingl, Sam Ravnborg, dri-devel,
	linux-amlogic, linux-arm-kernel, linux-kernel
  Cc: linmq006

of_find_device_by_node() takes a reference to the embedded struct device,
we should use put_device() to release it when not need anymore.
Add missing put_device() in error path to avoid refcount leak.

Fixes: 0af5e0b41110 ("drm/meson: encoder_hdmi: switch to bridge DRM_BRIDGE_ATTACH_NO_CONNECTOR")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
 drivers/gpu/drm/meson/meson_encoder_hdmi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
index 5e306de6f485..de87f02cd388 100644
--- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c
+++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
@@ -435,8 +435,10 @@ int meson_encoder_hdmi_init(struct meson_drm *priv)
 		cec_fill_conn_info_from_drm(&conn_info, meson_encoder_hdmi->connector);
 
 		notifier = cec_notifier_conn_register(&pdev->dev, NULL, &conn_info);
-		if (!notifier)
+		if (!notifier) {
+			put_device(&pdev->dev);
 			return -ENOMEM;
+		}
 
 		meson_encoder_hdmi->cec_notifier = notifier;
 	}
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-05-18  7:24 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-11  5:40 [PATCH] drm/meson: Fix refcount leak in meson_encoder_hdmi_init Miaoqian Lin
2022-05-12 12:20 ` Neil Armstrong
2022-05-12 12:38 ` Martin Blumenstingl
2022-05-12 15:33   ` Neil Armstrong
2022-05-18  7:23 ` Neil Armstrong
2022-05-12  9:21 Miaoqian Lin
2022-05-12  9:32 ` Neil Armstrong
2022-05-12 11:17   ` Miaoqian Lin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).