* [PATCH 2/4] media: platform: meson-ao-cec: fix possible object reference leak
@ 2019-02-09 2:52 Wen Yang
2019-02-10 10:57 ` Neil Armstrong
0 siblings, 1 reply; 2+ messages in thread
From: Wen Yang @ 2019-02-09 2:52 UTC (permalink / raw)
To: Neil Armstrong, Mauro Carvalho Chehab, Kevin Hilman
Cc: Wen Yang, linux-kernel, linux-media, linux-amlogic,
linux-arm-kernel, linux-media
The call to of_parse_phandle() returns a node pointer with refcount
incremented thus it must be explicitly decremented here after the last
usage.
The of_find_device_by_node() takes a reference to the underlying device
structure, we also should release that reference.
This patch fixes those two issues.
Fixes: 7ec2c0f72cb1 ("media: platform: Add Amlogic Meson AO CEC Controller driver")
Signed-off-by: Wen Yang <yellowriver2010@hotmail.com>
---
drivers/media/platform/meson/ao-cec.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/meson/ao-cec.c b/drivers/media/platform/meson/ao-cec.c
index cd4be38..8ba8b46 100644
--- a/drivers/media/platform/meson/ao-cec.c
+++ b/drivers/media/platform/meson/ao-cec.c
@@ -613,18 +613,25 @@ static int meson_ao_cec_probe(struct platform_device *pdev)
}
hdmi_dev = of_find_device_by_node(np);
- if (hdmi_dev == NULL)
+ if (hdmi_dev == NULL) {
+ of_node_put(np);
return -EPROBE_DEFER;
+ }
+ of_node_put(np);
ao_cec = devm_kzalloc(&pdev->dev, sizeof(*ao_cec), GFP_KERNEL);
- if (!ao_cec)
+ if (!ao_cec) {
+ put_device(&hdmi_dev->dev);
return -ENOMEM;
+ }
spin_lock_init(&ao_cec->cec_reg_lock);
ao_cec->notify = cec_notifier_get(&hdmi_dev->dev);
- if (!ao_cec->notify)
+ if (!ao_cec->notify) {
+ put_device(&hdmi_dev->dev);
return -ENOMEM;
+ }
ao_cec->adap = cec_allocate_adapter(&meson_ao_cec_ops, ao_cec,
"meson_ao_cec",
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 2/4] media: platform: meson-ao-cec: fix possible object reference leak
2019-02-09 2:52 [PATCH 2/4] media: platform: meson-ao-cec: fix possible object reference leak Wen Yang
@ 2019-02-10 10:57 ` Neil Armstrong
0 siblings, 0 replies; 2+ messages in thread
From: Neil Armstrong @ 2019-02-10 10:57 UTC (permalink / raw)
To: Wen Yang, Mauro Carvalho Chehab, Kevin Hilman
Cc: linux-amlogic, linux-media, linux-kernel, linux-arm-kernel, linux-media
Le 09/02/2019 03:52, Wen Yang a écrit :
> The call to of_parse_phandle() returns a node pointer with refcount
> incremented thus it must be explicitly decremented here after the last
> usage.
> The of_find_device_by_node() takes a reference to the underlying device
> structure, we also should release that reference.
> This patch fixes those two issues.
>
> Fixes: 7ec2c0f72cb1 ("media: platform: Add Amlogic Meson AO CEC Controller driver")
> Signed-off-by: Wen Yang <yellowriver2010@hotmail.com>
> ---
> drivers/media/platform/meson/ao-cec.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/platform/meson/ao-cec.c b/drivers/media/platform/meson/ao-cec.c
> index cd4be38..8ba8b46 100644
> --- a/drivers/media/platform/meson/ao-cec.c
> +++ b/drivers/media/platform/meson/ao-cec.c
> @@ -613,18 +613,25 @@ static int meson_ao_cec_probe(struct platform_device *pdev)
> }
>
> hdmi_dev = of_find_device_by_node(np);
> - if (hdmi_dev == NULL)
> + if (hdmi_dev == NULL) {
> + of_node_put(np);
> return -EPROBE_DEFER;
> + }
>
> + of_node_put(np);
> ao_cec = devm_kzalloc(&pdev->dev, sizeof(*ao_cec), GFP_KERNEL);
> - if (!ao_cec)
> + if (!ao_cec) {
> + put_device(&hdmi_dev->dev);
> return -ENOMEM;
> + }
>
> spin_lock_init(&ao_cec->cec_reg_lock);
>
> ao_cec->notify = cec_notifier_get(&hdmi_dev->dev);
> - if (!ao_cec->notify)
> + if (!ao_cec->notify) {
> + put_device(&hdmi_dev->dev);
> return -ENOMEM;
> + }
>
> ao_cec->adap = cec_allocate_adapter(&meson_ao_cec_ops, ao_cec,
> "meson_ao_cec",
>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Thanks for the fix !
Neil
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-10 10:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-09 2:52 [PATCH 2/4] media: platform: meson-ao-cec: fix possible object reference leak Wen Yang
2019-02-10 10:57 ` Neil Armstrong
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).