Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1270750

Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put

Show all headers | View raw

On Mon, Nov 16, 2015 at 12:33:14PM +0100, Julia Lawall wrote:
> for_each_available_child_of_node performs an of_node_get on each iteration,
> so a return from the middle of the loop requires an of_node_put.
> 
> A simplified version of the semantic patch that finds this problem is as
> follows (http://coccinelle.lip6.fr):
> 
> // <smpl>
> @@
> expression root,e;
> local idexpression child;
> @@
> 
>  for_each_available_child_of_node(root, child) {
>    ... when != of_node_put(child)
>        when != e = child
> (
>    return child;
> |
> *  return ...;
> )
>    ...
>  }
> // </smpl>
> 
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
> 
> ---

For this patch:

Acked-by: Brian Norris <computersforpeace@gmail.com>

>  drivers/phy/phy-brcmstb-sata.c |   17 ++++++++++++-----
>  1 file changed, 12 insertions(+), 5 deletions(-)

[snip patch, which fixes of_node_put() handling for
for_each_available_child_of_node() loop, which creates PHY devices with
devm_phy_create()]

This reminds me of a potential problem I'm looking at in other
subsystems: from code reading (I haven't seen any issues in practice,
probably because I don't use OF_DYNAMIC) it looks like device-creating
infrastructure like the PHY subsystem should be acquiring a reference to
the device_node when they stash it away. But drivers/phy/phy-core.c does
not do this, AFAICT.

See phy_create(), which does

	phy->dev.of_node = node ?: dev->of_node;

and later might reuse this of_node pointer, even though it never called
of_node_get() on this node.

Potential patch to fix this (not tested).

Signed-off-by: Brian Norris <computersforpeace@gmail.com>

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index fc48fac003a6..8df29caeeef9 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -697,6 +697,7 @@ struct phy *phy_create(struct device *dev, struct device_node *node,
 	phy->dev.class = phy_class;
 	phy->dev.parent = dev;
 	phy->dev.of_node = node ?: dev->of_node;
+	of_node_get(phy->dev.of_node);
 	phy->id = id;
 	phy->ops = ops;
 
@@ -726,6 +727,7 @@ struct phy *phy_create(struct device *dev, struct device_node *node,
 	return phy;
 
 put_dev:
+	of_node_put(phy->dev.of_node);
 	put_device(&phy->dev);  /* calls phy_release() which frees resources */
 	return ERR_PTR(ret);
 
@@ -775,6 +777,7 @@ EXPORT_SYMBOL_GPL(devm_phy_create);
  */
 void phy_destroy(struct phy *phy)
 {
+	of_node_put(phy->dev.of_node);
 	pm_runtime_disable(&phy->dev);
 	device_unregister(&phy->dev);
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/7] add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-11-16 12:50 +0100
  [PATCH 3/7] phy: berlin-sata: add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-11-16 12:50 +0100
    Re: [PATCH 3/7] phy: berlin-sata: add missing of_node_put Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> - 2015-11-19 21:50 +0100
  [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-11-16 12:50 +0100
    Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Brian Norris <computersforpeace@gmail.com> - 2015-11-17 02:40 +0100
      Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Julia Lawall <julia.lawall@lip6.fr> - 2015-11-17 07:20 +0100
        Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Julia Lawall <julia.lawall@lip6.fr> - 2015-11-17 18:50 +0100
          Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Brian Norris <computersforpeace@gmail.com> - 2015-11-17 19:40 +0100
            Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Brian Norris <computersforpeace@gmail.com> - 2015-11-17 19:40 +0100
            Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Julia Lawall <julia.lawall@lip6.fr> - 2015-11-17 23:40 +0100
              device_node lifetime (was: Re: [PATCH 1/7] phy: brcmstb-sata: add  missing of_node_put) Brian Norris <computersforpeace@gmail.com> - 2015-11-18 20:10 +0100
                Re: device_node lifetime (was: Re: [PATCH 1/7] phy: brcmstb-sata:  add missing of_node_put) Julia Lawall <julia.lawall@lip6.fr> - 2015-11-18 21:50 +0100
                Re: device_node lifetime (was: Re: [PATCH 1/7] phy: brcmstb-sata: add  missing of_node_put) Rob Herring <robh@kernel.org> - 2015-11-19 19:50 +0100
                Re: device_node lifetime (was: Re: [PATCH 1/7] phy: brcmstb-sata:  add missing of_node_put) Russell King - ARM Linux <linux@arm.linux.org.uk> - 2015-11-19 20:20 +0100
        Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Brian Norris <computersforpeace@gmail.com> - 2015-11-17 18:50 +0100
      Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Kishon Vijay Abraham I <kishon@ti.com> - 2015-11-27 15:20 +0100
  [PATCH 7/7] phy: cygnus: pcie: add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-11-16 12:50 +0100
    Re: [PATCH 7/7] phy: cygnus: pcie: add missing of_node_put Ray Jui <rjui@broadcom.com> - 2015-11-16 18:20 +0100

csiph-web