* [PATCH 0/3] add missing of_node_put
@ 2019-01-13 9:44 Julia Lawall
2019-01-13 9:44 ` [PATCH 3/3] drm/meson: " Julia Lawall
0 siblings, 1 reply; 3+ messages in thread
From: Julia Lawall @ 2019-01-13 9:44 UTC (permalink / raw)
To: devicetree
Cc: kernel-janitors, linux-kernel, dri-devel, linux-renesas-soc,
linux-amlogic, linux-arm-kernel
The result of of_graph_get_remote_port_parent needs an of_node_put,
even if it is not available.
---
drivers/gpu/drm/meson/meson_drv.c | 9 +++++++--
drivers/gpu/drm/rcar-du/rcar_du_kms.c | 1 +
drivers/of/property.c | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
_______________________________________________
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] 3+ messages in thread
* [PATCH 3/3] drm/meson: add missing of_node_put
2019-01-13 9:44 [PATCH 0/3] add missing of_node_put Julia Lawall
@ 2019-01-13 9:44 ` Julia Lawall
2019-01-14 15:32 ` Neil Armstrong
0 siblings, 1 reply; 3+ messages in thread
From: Julia Lawall @ 2019-01-13 9:44 UTC (permalink / raw)
To: Neil Armstrong
Cc: David Airlie, Kevin Hilman, kernel-janitors, linux-kernel,
dri-devel, Daniel Vetter, linux-amlogic, linux-arm-kernel
Add an of_node_put when the result of of_graph_get_remote_port_parent is
not available.
An of_node_put is also needed when meson_probe_remote completes. This was
present at the recursive call, but not in the call from meson_drv_probe.
The semantic match that finds this problem is as follows
(http://coccinelle.lip6.fr):
// <smpl>
@r exists@
local idexpression e;
expression x;
@@
e = of_graph_get_remote_port_parent(...);
... when != x = e
when != true e == NULL
when != of_node_put(e)
when != of_fwnode_handle(e)
(
return e;
|
*return ...;
)
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
---
drivers/gpu/drm/meson/meson_drv.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 3ee4d4a4e..b59c757 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -388,8 +388,10 @@ static int meson_probe_remote(struct platform_device *pdev,
remote_node = of_graph_get_remote_port_parent(ep);
if (!remote_node ||
remote_node == parent || /* Ignore parent endpoint */
- !of_device_is_available(remote_node))
+ !of_device_is_available(remote_node)) {
+ of_node_put(remote_node);
continue;
+ }
count += meson_probe_remote(pdev, match, remote, remote_node);
@@ -408,10 +410,13 @@ static int meson_drv_probe(struct platform_device *pdev)
for_each_endpoint_of_node(np, ep) {
remote = of_graph_get_remote_port_parent(ep);
- if (!remote || !of_device_is_available(remote))
+ if (!remote || !of_device_is_available(remote)) {
+ of_node_put(remote);
continue;
+ }
count += meson_probe_remote(pdev, &match, np, remote);
+ of_node_put(remote);
}
if (count && !match)
_______________________________________________
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] 3+ messages in thread
* Re: [PATCH 3/3] drm/meson: add missing of_node_put
2019-01-13 9:44 ` [PATCH 3/3] drm/meson: " Julia Lawall
@ 2019-01-14 15:32 ` Neil Armstrong
0 siblings, 0 replies; 3+ messages in thread
From: Neil Armstrong @ 2019-01-14 15:32 UTC (permalink / raw)
To: Julia Lawall
Cc: David Airlie, Kevin Hilman, kernel-janitors, linux-kernel,
dri-devel, Daniel Vetter, linux-amlogic, linux-arm-kernel
Hi Julia,
On 13/01/2019 10:44, Julia Lawall wrote:
> Add an of_node_put when the result of of_graph_get_remote_port_parent is
> not available.
>
> An of_node_put is also needed when meson_probe_remote completes. This was
> present at the recursive call, but not in the call from meson_drv_probe.
>
> The semantic match that finds this problem is as follows
> (http://coccinelle.lip6.fr):
>
> // <smpl>
> @r exists@
> local idexpression e;
> expression x;
> @@
> e = of_graph_get_remote_port_parent(...);
> ... when != x = e
> when != true e == NULL
> when != of_node_put(e)
> when != of_fwnode_handle(e)
> (
> return e;
> |
> *return ...;
> )
> // </smpl>
>
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
And applied to drm-misc-fixes.
Neil
>
> ---
> drivers/gpu/drm/meson/meson_drv.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
> index 3ee4d4a4e..b59c757 100644
> --- a/drivers/gpu/drm/meson/meson_drv.c
> +++ b/drivers/gpu/drm/meson/meson_drv.c
> @@ -388,8 +388,10 @@ static int meson_probe_remote(struct platform_device *pdev,
> remote_node = of_graph_get_remote_port_parent(ep);
> if (!remote_node ||
> remote_node == parent || /* Ignore parent endpoint */
> - !of_device_is_available(remote_node))
> + !of_device_is_available(remote_node)) {
> + of_node_put(remote_node);
> continue;
> + }
>
> count += meson_probe_remote(pdev, match, remote, remote_node);
>
> @@ -408,10 +410,13 @@ static int meson_drv_probe(struct platform_device *pdev)
>
> for_each_endpoint_of_node(np, ep) {
> remote = of_graph_get_remote_port_parent(ep);
> - if (!remote || !of_device_is_available(remote))
> + if (!remote || !of_device_is_available(remote)) {
> + of_node_put(remote);
> continue;
> + }
>
> count += meson_probe_remote(pdev, &match, np, remote);
> + of_node_put(remote);
> }
>
> if (count && !match)
>
_______________________________________________
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] 3+ messages in thread
end of thread, other threads:[~2019-01-14 15:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-13 9:44 [PATCH 0/3] add missing of_node_put Julia Lawall
2019-01-13 9:44 ` [PATCH 3/3] drm/meson: " Julia Lawall
2019-01-14 15:32 ` 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).